From 29f763d4e4779dd1b3264477c89ffc113705b91e Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 16:20:23 +0100 Subject: [PATCH 001/276] Update composer files. --- composer.json | 4 +- composer.lock | 688 ++++++++++++++++---------------------------------- 2 files changed, 214 insertions(+), 478 deletions(-) diff --git a/composer.json b/composer.json index 6f7bea2597..5c6784f143 100755 --- a/composer.json +++ b/composer.json @@ -48,7 +48,7 @@ "require": { "php": ">=7.0.0", "ext-intl": "*", - "laravel/framework": "5.3.29", + "laravel/framework": "5.4.*", "davejamesmiller/laravel-breadcrumbs": "^3.0", "watson/validating": "3.*", "doctrine/dbal": "^2.5", @@ -56,7 +56,7 @@ "twig/twig": "1.30.0", "rcrowe/twigbridge": "0.9.*", "league/csv": "8.*", - "laravelcollective/html": "^5.3", + "laravelcollective/html": "^5.4", "rmccue/requests": "1.*", "pragmarx/google2fa": "1.*", "bacon/bacon-qr-code": "1.*" diff --git a/composer.lock b/composer.lock index ae477e0989..0d10a81094 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "db26ae145d3656fe05d8a222fc21e263", + "content-hash": "3baa1b043873285dc937f9dad0083506", "packages": [ { "name": "bacon/bacon-qr-code", @@ -102,60 +102,6 @@ ], "time": "2016-05-05T11:49:03+00:00" }, - { - "name": "classpreloader/classpreloader", - "version": "3.1.0", - "source": { - "type": "git", - "url": "https://github.com/ClassPreloader/ClassPreloader.git", - "reference": "bc7206aa892b5a33f4680421b69b191efd32b096" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ClassPreloader/ClassPreloader/zipball/bc7206aa892b5a33f4680421b69b191efd32b096", - "reference": "bc7206aa892b5a33f4680421b69b191efd32b096", - "shasum": "" - }, - "require": { - "nikic/php-parser": "^1.0|^2.0|^3.0", - "php": ">=5.5.9" - }, - "require-dev": { - "phpunit/phpunit": "^4.8|^5.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev" - } - }, - "autoload": { - "psr-4": { - "ClassPreloader\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com" - }, - { - "name": "Graham Campbell", - "email": "graham@alt-three.com" - } - ], - "description": "Helps class loading performance by generating a single PHP file containing all of the autoloaded files for a specific use case", - "keywords": [ - "autoload", - "class", - "preload" - ], - "time": "2016-09-16T12:50:15+00:00" - }, { "name": "davejamesmiller/laravel-breadcrumbs", "version": "3.0.1", @@ -205,39 +151,6 @@ ], "time": "2016-08-28T16:57:03+00:00" }, - { - "name": "dnoegel/php-xdg-base-dir", - "version": "0.1", - "source": { - "type": "git", - "url": "https://github.com/dnoegel/php-xdg-base-dir.git", - "reference": "265b8593498b997dc2d31e75b89f053b5cc9621a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/265b8593498b997dc2d31e75b89f053b5cc9621a", - "reference": "265b8593498b997dc2d31e75b89f053b5cc9621a", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "@stable" - }, - "type": "project", - "autoload": { - "psr-4": { - "XdgBaseDir\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "implementation of xdg base directory specification for php", - "time": "2014-10-24T07:27:01+00:00" - }, { "name": "doctrine/annotations", "version": "v1.3.1", @@ -709,77 +622,26 @@ "time": "2014-09-09T13:34:57+00:00" }, { - "name": "jakub-onderka/php-console-color", - "version": "0.1", + "name": "erusev/parsedown", + "version": "1.6.1", "source": { "type": "git", - "url": "https://github.com/JakubOnderka/PHP-Console-Color.git", - "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1" + "url": "https://github.com/erusev/parsedown.git", + "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/e0b393dacf7703fc36a4efc3df1435485197e6c1", - "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/20ff8bbb57205368b4b42d094642a3e52dac85fb", + "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb", "shasum": "" }, "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "jakub-onderka/php-code-style": "1.0", - "jakub-onderka/php-parallel-lint": "0.*", - "jakub-onderka/php-var-dump-check": "0.*", - "phpunit/phpunit": "3.7.*", - "squizlabs/php_codesniffer": "1.*" - }, - "type": "library", - "autoload": { - "psr-0": { - "JakubOnderka\\PhpConsoleColor": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Jakub Onderka", - "email": "jakub.onderka@gmail.com", - "homepage": "http://www.acci.cz" - } - ], - "time": "2014-04-08T15:00:19+00:00" - }, - { - "name": "jakub-onderka/php-console-highlighter", - "version": "v0.3.2", - "source": { - "type": "git", - "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git", - "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5", - "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5", - "shasum": "" - }, - "require": { - "jakub-onderka/php-console-color": "~0.1", "php": ">=5.3.0" }, - "require-dev": { - "jakub-onderka/php-code-style": "~1.0", - "jakub-onderka/php-parallel-lint": "~0.5", - "jakub-onderka/php-var-dump-check": "~0.1", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.5" - }, "type": "library", "autoload": { "psr-0": { - "JakubOnderka\\PhpConsoleHighlighter": "src/" + "Parsedown": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -788,109 +650,55 @@ ], "authors": [ { - "name": "Jakub Onderka", - "email": "acci@acci.cz", - "homepage": "http://www.acci.cz/" + "name": "Emanuil Rusev", + "email": "hello@erusev.com", + "homepage": "http://erusev.com" } ], - "time": "2015-04-20T18:58:01+00:00" - }, - { - "name": "jeremeamia/SuperClosure", - "version": "2.3.0", - "source": { - "type": "git", - "url": "https://github.com/jeremeamia/super_closure.git", - "reference": "443c3df3207f176a1b41576ee2a66968a507b3db" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/443c3df3207f176a1b41576ee2a66968a507b3db", - "reference": "443c3df3207f176a1b41576ee2a66968a507b3db", - "shasum": "" - }, - "require": { - "nikic/php-parser": "^1.2|^2.0|^3.0", - "php": ">=5.4", - "symfony/polyfill-php56": "^1.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0|^5.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3-dev" - } - }, - "autoload": { - "psr-4": { - "SuperClosure\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jeremy Lindblom", - "email": "jeremeamia@gmail.com", - "homepage": "https://github.com/jeremeamia", - "role": "Developer" - } - ], - "description": "Serialize Closure objects, including their context and binding", - "homepage": "https://github.com/jeremeamia/super_closure", + "description": "Parser for Markdown.", + "homepage": "http://parsedown.org", "keywords": [ - "closure", - "function", - "lambda", - "parser", - "serializable", - "serialize", - "tokenizer" + "markdown", + "parser" ], - "time": "2016-12-07T09:37:55+00:00" + "time": "2016-11-02T15:56:58+00:00" }, { "name": "laravel/framework", - "version": "v5.3.29", + "version": "v5.4.6", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "6fd76dec90466dc3f703d8df72e38130f2ee6a32" + "reference": "5913b960656d7f978605ff9c1513ffbfd190c173" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/6fd76dec90466dc3f703d8df72e38130f2ee6a32", - "reference": "6fd76dec90466dc3f703d8df72e38130f2ee6a32", + "url": "https://api.github.com/repos/laravel/framework/zipball/5913b960656d7f978605ff9c1513ffbfd190c173", + "reference": "5913b960656d7f978605ff9c1513ffbfd190c173", "shasum": "" }, "require": { - "classpreloader/classpreloader": "~3.0", "doctrine/inflector": "~1.0", + "erusev/parsedown": "~1.6", "ext-mbstring": "*", "ext-openssl": "*", - "jeremeamia/superclosure": "~2.2", "league/flysystem": "~1.0", "monolog/monolog": "~1.11", "mtdowling/cron-expression": "~1.0", "nesbot/carbon": "~1.20", "paragonie/random_compat": "~1.4|~2.0", "php": ">=5.6.4", - "psy/psysh": "0.7.*|0.8.*", "ramsey/uuid": "~3.0", "swiftmailer/swiftmailer": "~5.4", - "symfony/console": "3.1.*", - "symfony/debug": "3.1.*", - "symfony/finder": "3.1.*", - "symfony/http-foundation": "3.1.*", - "symfony/http-kernel": "3.1.*", - "symfony/process": "3.1.*", - "symfony/routing": "3.1.*", - "symfony/translation": "3.1.*", - "symfony/var-dumper": "3.1.*", + "symfony/console": "~3.2", + "symfony/debug": "~3.2", + "symfony/finder": "~3.2", + "symfony/http-foundation": "~3.2", + "symfony/http-kernel": "~3.2", + "symfony/process": "~3.2", + "symfony/routing": "~3.2", + "symfony/var-dumper": "~3.2", + "tijsverkoyen/css-to-inline-styles": "~2.2", "vlucas/phpdotenv": "~2.2" }, "replace": { @@ -927,31 +735,34 @@ }, "require-dev": { "aws/aws-sdk-php": "~3.0", + "doctrine/dbal": "~2.5", "mockery/mockery": "~0.9.4", "pda/pheanstalk": "~3.0", - "phpunit/phpunit": "~5.4", + "phpunit/phpunit": "~5.7", "predis/predis": "~1.0", - "symfony/css-selector": "3.1.*", - "symfony/dom-crawler": "3.1.*" + "symfony/css-selector": "~3.2", + "symfony/dom-crawler": "~3.2" }, "suggest": { "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).", - "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.4).", + "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.5).", "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).", - "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~5.3|~6.0).", + "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).", + "laravel/tinker": "Required to use the tinker console command (~1.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).", "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).", + "nexmo/client": "Required to use the Nexmo transport (~1.0).", "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).", "predis/predis": "Required to use the redis cache and queue drivers (~1.0).", "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).", - "symfony/css-selector": "Required to use some of the crawler integration testing tools (3.1.*).", - "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (3.1.*).", - "symfony/psr-http-message-bridge": "Required to use psr7 bridging features (0.2.*)." + "symfony/css-selector": "Required to use some of the crawler integration testing tools (~3.2).", + "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~3.2).", + "symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.3-dev" + "dev-master": "5.4-dev" } }, "autoload": { @@ -979,32 +790,32 @@ "framework", "laravel" ], - "time": "2017-01-06T14:33:56+00:00" + "time": "2017-01-27T19:27:15+00:00" }, { "name": "laravelcollective/html", - "version": "v5.3.1", + "version": "v5.4.1", "source": { "type": "git", "url": "https://github.com/LaravelCollective/html.git", - "reference": "2f7f2e127c6fed47f269ea29ab5efeb8f65e9d35" + "reference": "7570f25d58a00fd6909c0563808590f9cdb14d47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/2f7f2e127c6fed47f269ea29ab5efeb8f65e9d35", - "reference": "2f7f2e127c6fed47f269ea29ab5efeb8f65e9d35", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/7570f25d58a00fd6909c0563808590f9cdb14d47", + "reference": "7570f25d58a00fd6909c0563808590f9cdb14d47", "shasum": "" }, "require": { - "illuminate/http": "5.3.*", - "illuminate/routing": "5.3.*", - "illuminate/session": "5.3.*", - "illuminate/support": "5.3.*", - "illuminate/view": "5.3.*", + "illuminate/http": "5.4.*", + "illuminate/routing": "5.4.*", + "illuminate/session": "5.4.*", + "illuminate/support": "5.4.*", + "illuminate/view": "5.4.*", "php": ">=5.6.4" }, "require-dev": { - "illuminate/database": "5.3.*", + "illuminate/database": "5.4.*", "mockery/mockery": "~0.9.4", "phpunit/phpunit": "~5.4" }, @@ -1033,7 +844,7 @@ ], "description": "HTML and Form Builders for the Laravel Framework", "homepage": "http://laravelcollective.com", - "time": "2016-12-13T14:23:36+00:00" + "time": "2017-01-26T19:27:05+00:00" }, { "name": "league/commonmark", @@ -1419,57 +1230,6 @@ ], "time": "2017-01-16T07:55:07+00:00" }, - { - "name": "nikic/php-parser", - "version": "v3.0.2", - "source": { - "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "adf44419c0fc014a0f191db6f89d3e55d4211744" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/adf44419c0fc014a0f191db6f89d3e55d4211744", - "reference": "adf44419c0fc014a0f191db6f89d3e55d4211744", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=5.5" - }, - "require-dev": { - "phpunit/phpunit": "~4.0|~5.0" - }, - "bin": [ - "bin/php-parse" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "PhpParser\\": "lib/PhpParser" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nikita Popov" - } - ], - "description": "A PHP parser written in PHP", - "keywords": [ - "parser", - "php" - ], - "time": "2016-12-06T11:30:35+00:00" - }, { "name": "paragonie/random_compat", "version": "v2.0.4", @@ -1626,79 +1386,6 @@ ], "time": "2016-10-10T12:19:37+00:00" }, - { - "name": "psy/psysh", - "version": "v0.8.1", - "source": { - "type": "git", - "url": "https://github.com/bobthecow/psysh.git", - "reference": "701e8a1cc426ee170f1296f5d9f6b8a26ad25c4a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/701e8a1cc426ee170f1296f5d9f6b8a26ad25c4a", - "reference": "701e8a1cc426ee170f1296f5d9f6b8a26ad25c4a", - "shasum": "" - }, - "require": { - "dnoegel/php-xdg-base-dir": "0.1", - "jakub-onderka/php-console-highlighter": "0.3.*", - "nikic/php-parser": "~1.3|~2.0|~3.0", - "php": ">=5.3.9", - "symfony/console": "~2.3.10|^2.4.2|~3.0", - "symfony/var-dumper": "~2.7|~3.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "~1.11", - "hoa/console": "~3.16|~1.14", - "phpunit/phpunit": "~4.4|~5.0", - "symfony/finder": "~2.1|~3.0" - }, - "suggest": { - "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", - "ext-pdo-sqlite": "The doc command requires SQLite to work.", - "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.", - "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history.", - "hoa/console": "A pure PHP readline implementation. You'll want this if your PHP install doesn't already support readline or libedit." - }, - "bin": [ - "bin/psysh" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-develop": "0.9.x-dev" - } - }, - "autoload": { - "files": [ - "src/Psy/functions.php" - ], - "psr-4": { - "Psy\\": "src/Psy/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Justin Hileman", - "email": "justin@justinhileman.info", - "homepage": "http://justinhileman.com" - } - ], - "description": "An interactive shell for modern PHP.", - "homepage": "http://psysh.org", - "keywords": [ - "REPL", - "console", - "interactive", - "shell" - ], - "time": "2017-01-15T17:54:13+00:00" - }, { "name": "ramsey/uuid", "version": "3.5.2", @@ -1950,16 +1637,16 @@ }, { "name": "symfony/console", - "version": "v3.1.10", + "version": "v3.2.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "047f16485d68c083bd5d9b73ff16f9cb9c1a9f52" + "reference": "4f9e449e76996adf310498a8ca955c6deebe29dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/047f16485d68c083bd5d9b73ff16f9cb9c1a9f52", - "reference": "047f16485d68c083bd5d9b73ff16f9cb9c1a9f52", + "url": "https://api.github.com/repos/symfony/console/zipball/4f9e449e76996adf310498a8ca955c6deebe29dd", + "reference": "4f9e449e76996adf310498a8ca955c6deebe29dd", "shasum": "" }, "require": { @@ -1970,17 +1657,19 @@ "require-dev": { "psr/log": "~1.0", "symfony/event-dispatcher": "~2.8|~3.0", + "symfony/filesystem": "~2.8|~3.0", "symfony/process": "~2.8|~3.0" }, "suggest": { "psr/log": "For using the console logger", "symfony/event-dispatcher": "", + "symfony/filesystem": "", "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -2007,20 +1696,73 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-01-08T20:43:43+00:00" + "time": "2017-01-08T20:47:33+00:00" }, { - "name": "symfony/debug", + "name": "symfony/css-selector", "version": "v3.1.10", "source": { "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "c6661361626b3cf5cf2089df98b3b5006a197e85" + "url": "https://github.com/symfony/css-selector.git", + "reference": "722a87478a72d95dc2a3bcf41dc9c2d13fd4cb2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/c6661361626b3cf5cf2089df98b3b5006a197e85", - "reference": "c6661361626b3cf5cf2089df98b3b5006a197e85", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/722a87478a72d95dc2a3bcf41dc9c2d13fd4cb2d", + "reference": "722a87478a72d95dc2a3bcf41dc9c2d13fd4cb2d", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\CssSelector\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony CssSelector Component", + "homepage": "https://symfony.com", + "time": "2017-01-02T20:31:54+00:00" + }, + { + "name": "symfony/debug", + "version": "v3.2.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/debug.git", + "reference": "810ba5c1c5352a4ddb15d4719e8936751dff0b05" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/debug/zipball/810ba5c1c5352a4ddb15d4719e8936751dff0b05", + "reference": "810ba5c1c5352a4ddb15d4719e8936751dff0b05", "shasum": "" }, "require": { @@ -2037,7 +1779,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -2064,7 +1806,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-01-28T00:04:57+00:00" + "time": "2017-01-02T20:32:22+00:00" }, { "name": "symfony/event-dispatcher", @@ -2128,16 +1870,16 @@ }, { "name": "symfony/finder", - "version": "v3.1.10", + "version": "v3.2.2", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "59687a255d1562f2c17b012418273862083d85f7" + "reference": "8c71141cae8e2957946b403cc71a67213c0380d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/59687a255d1562f2c17b012418273862083d85f7", - "reference": "59687a255d1562f2c17b012418273862083d85f7", + "url": "https://api.github.com/repos/symfony/finder/zipball/8c71141cae8e2957946b403cc71a67213c0380d6", + "reference": "8c71141cae8e2957946b403cc71a67213c0380d6", "shasum": "" }, "require": { @@ -2146,7 +1888,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -2173,20 +1915,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-01-02T20:31:54+00:00" + "time": "2017-01-02T20:32:22+00:00" }, { "name": "symfony/http-foundation", - "version": "v3.1.10", + "version": "v3.2.2", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "cef0ad49a2e90455cfc649522025b5a2929648c0" + "reference": "33eb76bf1d833c705433e5361a646c164696394b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cef0ad49a2e90455cfc649522025b5a2929648c0", - "reference": "cef0ad49a2e90455cfc649522025b5a2929648c0", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/33eb76bf1d833c705433e5361a646c164696394b", + "reference": "33eb76bf1d833c705433e5361a646c164696394b", "shasum": "" }, "require": { @@ -2199,7 +1941,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -2226,20 +1968,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2017-01-08T20:43:43+00:00" + "time": "2017-01-08T20:47:33+00:00" }, { "name": "symfony/http-kernel", - "version": "v3.1.10", + "version": "v3.2.2", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "c830387dec1b48c100473d10a6a356c3c3ae2a13" + "reference": "8a898e340a89022246645b1288d295f49c9381e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/c830387dec1b48c100473d10a6a356c3c3ae2a13", - "reference": "c830387dec1b48c100473d10a6a356c3c3ae2a13", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8a898e340a89022246645b1288d295f49c9381e4", + "reference": "8a898e340a89022246645b1288d295f49c9381e4", "shasum": "" }, "require": { @@ -2267,7 +2009,7 @@ "symfony/stopwatch": "~2.8|~3.0", "symfony/templating": "~2.8|~3.0", "symfony/translation": "~2.8|~3.0", - "symfony/var-dumper": "~2.8|~3.0" + "symfony/var-dumper": "~3.2" }, "suggest": { "symfony/browser-kit": "", @@ -2281,7 +2023,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -2308,7 +2050,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2017-01-28T02:53:17+00:00" + "time": "2017-01-12T21:36:33+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -2479,16 +2221,16 @@ }, { "name": "symfony/process", - "version": "v3.1.10", + "version": "v3.2.2", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "2605753c5f8c531623d24d002825ebb1d6a22248" + "reference": "350e810019fc52dd06ae844b6a6d382f8a0e8893" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/2605753c5f8c531623d24d002825ebb1d6a22248", - "reference": "2605753c5f8c531623d24d002825ebb1d6a22248", + "url": "https://api.github.com/repos/symfony/process/zipball/350e810019fc52dd06ae844b6a6d382f8a0e8893", + "reference": "350e810019fc52dd06ae844b6a6d382f8a0e8893", "shasum": "" }, "require": { @@ -2497,7 +2239,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -2524,20 +2266,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-01-21T17:13:55+00:00" + "time": "2017-01-02T20:32:22+00:00" }, { "name": "symfony/routing", - "version": "v3.1.10", + "version": "v3.2.2", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "f25581d4eb0a82962c291917f826166f0dcd8a9a" + "reference": "fda2c67d47ec801726ca888c95d701d31b27b444" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/f25581d4eb0a82962c291917f826166f0dcd8a9a", - "reference": "f25581d4eb0a82962c291917f826166f0dcd8a9a", + "url": "https://api.github.com/repos/symfony/routing/zipball/fda2c67d47ec801726ca888c95d701d31b27b444", + "reference": "fda2c67d47ec801726ca888c95d701d31b27b444", "shasum": "" }, "require": { @@ -2566,7 +2308,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -2599,20 +2341,20 @@ "uri", "url" ], - "time": "2017-01-28T00:04:57+00:00" + "time": "2017-01-02T20:32:22+00:00" }, { "name": "symfony/translation", - "version": "v3.1.10", + "version": "v3.2.2", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "d5a20fab5f63f44c233c69b3041c3cb1d4945e45" + "reference": "6520f3d4cce604d9dd1e86cac7af954984dd9bda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/d5a20fab5f63f44c233c69b3041c3cb1d4945e45", - "reference": "d5a20fab5f63f44c233c69b3041c3cb1d4945e45", + "url": "https://api.github.com/repos/symfony/translation/zipball/6520f3d4cce604d9dd1e86cac7af954984dd9bda", + "reference": "6520f3d4cce604d9dd1e86cac7af954984dd9bda", "shasum": "" }, "require": { @@ -2636,7 +2378,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -2663,20 +2405,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2017-01-21T17:01:39+00:00" + "time": "2017-01-02T20:32:22+00:00" }, { "name": "symfony/var-dumper", - "version": "v3.1.10", + "version": "v3.2.2", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "16df11647e5b992d687cb4eeeb9a882d5f5c26b9" + "reference": "b54b23f9a19b465e76fdaac0f6732410467c83b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/16df11647e5b992d687cb4eeeb9a882d5f5c26b9", - "reference": "16df11647e5b992d687cb4eeeb9a882d5f5c26b9", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b54b23f9a19b465e76fdaac0f6732410467c83b2", + "reference": "b54b23f9a19b465e76fdaac0f6732410467c83b2", "shasum": "" }, "require": { @@ -2692,7 +2434,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -2726,7 +2468,54 @@ "debug", "dump" ], - "time": "2017-01-24T13:02:38+00:00" + "time": "2017-01-03T08:53:57+00:00" + }, + { + "name": "tijsverkoyen/css-to-inline-styles", + "version": "2.2.0", + "source": { + "type": "git", + "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", + "reference": "ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b", + "reference": "ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7", + "symfony/css-selector": "^2.7|~3.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.8|5.1.*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "TijsVerkoyen\\CssToInlineStyles\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Tijs Verkoyen", + "email": "css_to_inline_styles@verkoyen.eu", + "role": "Developer" + } + ], + "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", + "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", + "time": "2016-09-20T12:50:39+00:00" }, { "name": "twig/twig", @@ -4588,59 +4377,6 @@ "homepage": "https://symfony.com", "time": "2017-01-10T14:14:38+00:00" }, - { - "name": "symfony/css-selector", - "version": "v3.1.10", - "source": { - "type": "git", - "url": "https://github.com/symfony/css-selector.git", - "reference": "722a87478a72d95dc2a3bcf41dc9c2d13fd4cb2d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/722a87478a72d95dc2a3bcf41dc9c2d13fd4cb2d", - "reference": "722a87478a72d95dc2a3bcf41dc9c2d13fd4cb2d", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\CssSelector\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jean-François Simon", - "email": "jeanfrancois.simon@sensiolabs.com" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony CssSelector Component", - "homepage": "https://symfony.com", - "time": "2017-01-02T20:31:54+00:00" - }, { "name": "symfony/dom-crawler", "version": "v3.1.10", From 395aaad9c6b5668f8e2d0259ab6c9ac4e4a55ef9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 16:21:01 +0100 Subject: [PATCH 002/276] New class name. --- app/Console/Kernel.php | 2 +- app/Http/Kernel.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 8ea0f88014..f7c14fc8f3 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -39,7 +39,7 @@ class Kernel extends ConsoleKernel */ protected $bootstrappers = [ - 'Illuminate\Foundation\Bootstrap\DetectEnvironment', + 'Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables', 'Illuminate\Foundation\Bootstrap\LoadConfiguration', 'FireflyIII\Bootstrap\ConfigureLogging', 'Illuminate\Foundation\Bootstrap\HandleExceptions', diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index e8dc229028..394ad35826 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -48,7 +48,7 @@ class Kernel extends HttpKernel */ protected $bootstrappers = [ - 'Illuminate\Foundation\Bootstrap\DetectEnvironment', + 'Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables', 'Illuminate\Foundation\Bootstrap\LoadConfiguration', 'FireflyIII\Bootstrap\ConfigureLogging', 'Illuminate\Foundation\Bootstrap\HandleExceptions', From b79dcd7f2398e31782069ae9f4595b24dd28986b Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 16:27:33 +0100 Subject: [PATCH 003/276] Disable ConfigureLogging class. --- app/Console/Kernel.php | 2 +- app/Http/Kernel.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index f7c14fc8f3..f4a1e32559 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -41,7 +41,7 @@ class Kernel extends ConsoleKernel = [ 'Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables', 'Illuminate\Foundation\Bootstrap\LoadConfiguration', - 'FireflyIII\Bootstrap\ConfigureLogging', + //'FireflyIII\Bootstrap\ConfigureLogging', 'Illuminate\Foundation\Bootstrap\HandleExceptions', 'Illuminate\Foundation\Bootstrap\RegisterFacades', 'Illuminate\Foundation\Bootstrap\SetRequestForConsole', diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 394ad35826..c552a552ee 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -50,7 +50,7 @@ class Kernel extends HttpKernel = [ 'Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables', 'Illuminate\Foundation\Bootstrap\LoadConfiguration', - 'FireflyIII\Bootstrap\ConfigureLogging', + //'FireflyIII\Bootstrap\ConfigureLogging', 'Illuminate\Foundation\Bootstrap\HandleExceptions', 'Illuminate\Foundation\Bootstrap\RegisterFacades', 'Illuminate\Foundation\Bootstrap\RegisterProviders', From 14971cf2498ae3d2b5d36e4a2a24ff9d25d5b131 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 16:30:35 +0100 Subject: [PATCH 004/276] Overrule logging. --- app/Providers/LogServiceProvider.php | 53 ++++++++++++++++++++++++++++ config/app.php | 10 +++--- 2 files changed, 58 insertions(+), 5 deletions(-) create mode 100644 app/Providers/LogServiceProvider.php diff --git a/app/Providers/LogServiceProvider.php b/app/Providers/LogServiceProvider.php new file mode 100644 index 0000000000..86bf30481f --- /dev/null +++ b/app/Providers/LogServiceProvider.php @@ -0,0 +1,53 @@ +useDailyFiles( + $this->app->storagePath() . '/logs/firefly-iii.log', $this->maxFiles(), + $this->logLevel() + ); + } + + /** + * Configure the Monolog handlers for the application. + * + * @param \Illuminate\Log\Writer $log + * + * @return void + */ + protected function configureSingleHandler(Writer $log) + { + $log->useFiles( + $this->app->storagePath() . '/logs/firefly-iii.log', + $this->logLevel() + ); + } +} \ No newline at end of file diff --git a/config/app.php b/config/app.php index 4933ad1c8c..125ec35093 100755 --- a/config/app.php +++ b/config/app.php @@ -26,8 +26,8 @@ return [ 'providers' => [ /* - * Laravel Framework Service Providers... - */ + * Laravel Framework Service Providers... + */ Illuminate\Auth\AuthServiceProvider::class, Illuminate\Broadcasting\BroadcastServiceProvider::class, Illuminate\Bus\BusServiceProvider::class, @@ -50,12 +50,11 @@ return [ Illuminate\Translation\TranslationServiceProvider::class, Illuminate\Validation\ValidationServiceProvider::class, Illuminate\View\ViewServiceProvider::class, - Collective\Html\HtmlServiceProvider::class, - /* * Application Service Providers... */ + FireflyIII\Providers\LogServiceProvider::class, FireflyIII\Providers\AppServiceProvider::class, FireflyIII\Providers\AuthServiceProvider::class, // FireflyIII\Providers\BroadcastServiceProvider::class, @@ -92,11 +91,12 @@ return [ ], 'aliases' => [ - 'App' => Illuminate\Support\Facades\App::class, 'Artisan' => Illuminate\Support\Facades\Artisan::class, 'Auth' => Illuminate\Support\Facades\Auth::class, 'Blade' => Illuminate\Support\Facades\Blade::class, + 'Broadcast' => Illuminate\Support\Facades\Broadcast::class, + 'Bus' => Illuminate\Support\Facades\Bus::class, 'Cache' => Illuminate\Support\Facades\Cache::class, 'Config' => Illuminate\Support\Facades\Config::class, 'Cookie' => Illuminate\Support\Facades\Cookie::class, From e80298f81554b67ca60cd1907113ec6378cb91f3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 16:31:41 +0100 Subject: [PATCH 005/276] Include laravel bread crumbs and custom repository. --- composer.json | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 5c6784f143..4c1764d3c0 100755 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "financials", "financial", "budgets", - "administration", + "administration", "tool", "tooling", "help", @@ -49,7 +49,7 @@ "php": ">=7.0.0", "ext-intl": "*", "laravel/framework": "5.4.*", - "davejamesmiller/laravel-breadcrumbs": "^3.0", + "davejamesmiller/laravel-breadcrumbs": "3.1", "watson/validating": "3.*", "doctrine/dbal": "^2.5", "league/commonmark": "0.15.*", @@ -106,5 +106,11 @@ }, "config": { "preferred-install": "dist" - } + }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/firefly-iii/laravel-breadcrumbs.git" + } + ] } From 4bc3af717641173cc28d2a3c6551688d9b1d7e6f Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 16:35:31 +0100 Subject: [PATCH 006/276] Updated composer.lock file for change to bread crumbs. --- composer.lock | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/composer.lock b/composer.lock index 0d10a81094..46a59ecc21 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "3baa1b043873285dc937f9dad0083506", + "content-hash": "485d633a8ac40b245a597a33fae7abf4", "packages": [ { "name": "bacon/bacon-qr-code", @@ -104,16 +104,16 @@ }, { "name": "davejamesmiller/laravel-breadcrumbs", - "version": "3.0.1", + "version": "3.1", "source": { "type": "git", - "url": "https://github.com/davejamesmiller/laravel-breadcrumbs.git", - "reference": "460bf79e83ff9e3db1e3f1c40169d8893893f8ff" + "url": "https://github.com/firefly-iii/laravel-breadcrumbs.git", + "reference": "afebafc321432188b10dafc7b4c072501687f3d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/davejamesmiller/laravel-breadcrumbs/zipball/460bf79e83ff9e3db1e3f1c40169d8893893f8ff", - "reference": "460bf79e83ff9e3db1e3f1c40169d8893893f8ff", + "url": "https://api.github.com/repos/firefly-iii/laravel-breadcrumbs/zipball/afebafc321432188b10dafc7b4c072501687f3d0", + "reference": "afebafc321432188b10dafc7b4c072501687f3d0", "shasum": "" }, "require": { @@ -133,7 +133,6 @@ "DaveJamesMiller\\Breadcrumbs\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT License" ], @@ -141,15 +140,18 @@ { "name": "Dave James Miller", "email": "dave@davejamesmiller.com", - "homepage": "http://davejamesmiller.com/" + "homepage": "https://davejamesmiller.com/" } ], "description": "A simple Laravel-style way to create breadcrumbs in Laravel 4+.", - "homepage": "http://laravel-breadcrumbs.davejamesmiller.com", + "homepage": "https://laravel-breadcrumbs.readthedocs.io/", "keywords": [ "laravel" ], - "time": "2016-08-28T16:57:03+00:00" + "support": { + "source": "https://github.com/firefly-iii/laravel-breadcrumbs/tree/3.1" + }, + "time": "2017-01-30T07:52:50+00:00" }, { "name": "doctrine/annotations", From 4cad2eb0c4bde7c6ff24ced0393e8631f6ce0ea3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 16:35:41 +0100 Subject: [PATCH 007/276] Upgraded validator --- app/Validation/FireflyValidator.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index 61590816b4..f38a164993 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -27,9 +27,9 @@ use FireflyIII\Rules\Triggers\TriggerInterface; use FireflyIII\User; use Google2FA; use Illuminate\Contracts\Encryption\DecryptException; +use Illuminate\Contracts\Translation\Translator; use Illuminate\Validation\Validator; use Session; -use Symfony\Component\Translation\TranslatorInterface; /** * Class FireflyValidator @@ -40,14 +40,14 @@ class FireflyValidator extends Validator { /** - * @param TranslatorInterface $translator - * @param array $data - * @param array $rules - * @param array $messages - * @param array $customAttributes + * @param Translator $translator + * @param array $data + * @param array $rules + * @param array $messages + * @param array $customAttributes * */ - public function __construct(TranslatorInterface $translator, array $data, array $rules, array $messages = [], array $customAttributes = []) + public function __construct(Translator $translator, array $data, array $rules, array $messages = [], array $customAttributes = []) { parent::__construct($translator, $data, $rules, $messages, $customAttributes); } @@ -158,6 +158,7 @@ class FireflyValidator extends Validator public function validateMore($attribute, $value, $parameters): bool { $compare = $parameters[0] ?? '0'; + return bccomp($value, $compare) > 0; } From 84e380e4d06f8056f09cc549dcbff125d5565153 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 16:40:49 +0100 Subject: [PATCH 008/276] Give all repositories a new setUser function. --- app/Repositories/Account/AccountRepositoryInterface.php | 6 ++++++ app/Repositories/Account/AccountTaskerInterface.php | 5 +++++ .../Attachment/AttachmentRepositoryInterface.php | 6 ++++++ app/Repositories/Bill/BillRepositoryInterface.php | 5 +++++ app/Repositories/Budget/BudgetRepositoryInterface.php | 5 +++++ app/Repositories/Category/CategoryRepositoryInterface.php | 6 ++++++ app/Repositories/Currency/CurrencyRepositoryInterface.php | 6 ++++++ app/Repositories/ExportJob/ExportJobRepositoryInterface.php | 6 ++++++ app/Repositories/ImportJob/ImportJobRepositoryInterface.php | 6 ++++++ app/Repositories/Journal/JournalRepositoryInterface.php | 6 +++++- app/Repositories/Journal/JournalTaskerInterface.php | 5 +++++ app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php | 5 +++++ app/Repositories/Rule/RuleRepositoryInterface.php | 6 +++++- app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php | 6 +++++- app/Repositories/Tag/TagRepositoryInterface.php | 6 ++++++ app/Repositories/User/UserRepositoryInterface.php | 1 + 16 files changed, 83 insertions(+), 3 deletions(-) diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php index 428e48144d..d19ba94d52 100644 --- a/app/Repositories/Account/AccountRepositoryInterface.php +++ b/app/Repositories/Account/AccountRepositoryInterface.php @@ -16,6 +16,7 @@ namespace FireflyIII\Repositories\Account; use Carbon\Carbon; use FireflyIII\Models\Account; use FireflyIII\Models\TransactionJournal; +use FireflyIII\User; use Illuminate\Support\Collection; /** @@ -26,6 +27,11 @@ use Illuminate\Support\Collection; interface AccountRepositoryInterface { + /** + * @param User $user + */ + public function setUser(User $user); + /** * Moved here from account CRUD. * diff --git a/app/Repositories/Account/AccountTaskerInterface.php b/app/Repositories/Account/AccountTaskerInterface.php index 57fbebaa79..81ef432b9e 100644 --- a/app/Repositories/Account/AccountTaskerInterface.php +++ b/app/Repositories/Account/AccountTaskerInterface.php @@ -14,6 +14,7 @@ declare(strict_types = 1); namespace FireflyIII\Repositories\Account; use Carbon\Carbon; +use FireflyIII\User; use Illuminate\Support\Collection; /** @@ -23,6 +24,10 @@ use Illuminate\Support\Collection; */ interface AccountTaskerInterface { + /** + * @param User $user + */ + public function setUser(User $user); /** * @param Collection $accounts diff --git a/app/Repositories/Attachment/AttachmentRepositoryInterface.php b/app/Repositories/Attachment/AttachmentRepositoryInterface.php index 9e12092c70..25dc72ff38 100644 --- a/app/Repositories/Attachment/AttachmentRepositoryInterface.php +++ b/app/Repositories/Attachment/AttachmentRepositoryInterface.php @@ -15,6 +15,7 @@ namespace FireflyIII\Repositories\Attachment; use Carbon\Carbon; use FireflyIII\Models\Attachment; +use FireflyIII\User; use Illuminate\Support\Collection; /** @@ -25,6 +26,11 @@ use Illuminate\Support\Collection; interface AttachmentRepositoryInterface { + /** + * @param User $user + */ + public function setUser(User $user); + /** * @param Attachment $attachment * diff --git a/app/Repositories/Bill/BillRepositoryInterface.php b/app/Repositories/Bill/BillRepositoryInterface.php index c2c6cd223d..af6dd36dab 100644 --- a/app/Repositories/Bill/BillRepositoryInterface.php +++ b/app/Repositories/Bill/BillRepositoryInterface.php @@ -16,6 +16,7 @@ namespace FireflyIII\Repositories\Bill; use Carbon\Carbon; use FireflyIII\Models\Bill; use FireflyIII\Models\TransactionJournal; +use FireflyIII\User; use Illuminate\Support\Collection; /** @@ -25,6 +26,10 @@ use Illuminate\Support\Collection; */ interface BillRepositoryInterface { + /** + * @param User $user + */ + public function setUser(User $user); /** * @param Bill $bill diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index ee9eba1641..3eefa19b01 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -17,6 +17,7 @@ use Carbon\Carbon; use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\TransactionCurrency; +use FireflyIII\User; use Illuminate\Support\Collection; /** @@ -26,6 +27,10 @@ use Illuminate\Support\Collection; */ interface BudgetRepositoryInterface { + /** + * @param User $user + */ + public function setUser(User $user); /** * @return bool diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php index 1194fbbf74..80b42d6852 100644 --- a/app/Repositories/Category/CategoryRepositoryInterface.php +++ b/app/Repositories/Category/CategoryRepositoryInterface.php @@ -15,6 +15,7 @@ namespace FireflyIII\Repositories\Category; use Carbon\Carbon; use FireflyIII\Models\Category; +use FireflyIII\User; use Illuminate\Support\Collection; /** @@ -24,6 +25,11 @@ use Illuminate\Support\Collection; */ interface CategoryRepositoryInterface { + /** + * @param User $user + */ + public function setUser(User $user); + /** * @param Category $category * diff --git a/app/Repositories/Currency/CurrencyRepositoryInterface.php b/app/Repositories/Currency/CurrencyRepositoryInterface.php index 4ccebe40b0..9c63c1fbfc 100644 --- a/app/Repositories/Currency/CurrencyRepositoryInterface.php +++ b/app/Repositories/Currency/CurrencyRepositoryInterface.php @@ -16,6 +16,7 @@ namespace FireflyIII\Repositories\Currency; use FireflyIII\Models\Preference; use FireflyIII\Models\TransactionCurrency; +use FireflyIII\User; use Illuminate\Support\Collection; /** @@ -25,6 +26,11 @@ use Illuminate\Support\Collection; */ interface CurrencyRepositoryInterface { + /** + * @param User $user + */ + public function setUser(User $user); + /** * @param TransactionCurrency $currency * diff --git a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php index 6f3c7a30b1..484e8496b5 100644 --- a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php +++ b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php @@ -14,6 +14,7 @@ declare(strict_types = 1); namespace FireflyIII\Repositories\ExportJob; use FireflyIII\Models\ExportJob; +use FireflyIII\User; /** * Interface ExportJobRepositoryInterface @@ -22,6 +23,11 @@ use FireflyIII\Models\ExportJob; */ interface ExportJobRepositoryInterface { + /** + * @param User $user + */ + public function setUser(User $user); + /** * @param ExportJob $job * @param string $status diff --git a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php index a17d9ca62c..b58468f1af 100644 --- a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php +++ b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php @@ -14,6 +14,7 @@ declare(strict_types = 1); namespace FireflyIII\Repositories\ImportJob; use FireflyIII\Models\ImportJob; +use FireflyIII\User; /** * Interface ImportJobRepositoryInterface @@ -22,6 +23,11 @@ use FireflyIII\Models\ImportJob; */ interface ImportJobRepositoryInterface { + /** + * @param User $user + */ + public function setUser(User $user); + /** * @param string $fileType * diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php index 0b62a5729a..446d21c184 100644 --- a/app/Repositories/Journal/JournalRepositoryInterface.php +++ b/app/Repositories/Journal/JournalRepositoryInterface.php @@ -16,6 +16,7 @@ namespace FireflyIII\Repositories\Journal; use FireflyIII\Models\Account; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionType; +use FireflyIII\User; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; @@ -26,7 +27,10 @@ use Illuminate\Support\MessageBag; */ interface JournalRepositoryInterface { - + /** + * @param User $user + */ + public function setUser(User $user); /** * @param TransactionJournal $journal * @param TransactionType $type diff --git a/app/Repositories/Journal/JournalTaskerInterface.php b/app/Repositories/Journal/JournalTaskerInterface.php index 058bc63733..e5c007c1e7 100644 --- a/app/Repositories/Journal/JournalTaskerInterface.php +++ b/app/Repositories/Journal/JournalTaskerInterface.php @@ -15,6 +15,7 @@ namespace FireflyIII\Repositories\Journal; use FireflyIII\Models\TransactionJournal; +use FireflyIII\User; use Illuminate\Support\Collection; /** @@ -24,6 +25,10 @@ use Illuminate\Support\Collection; */ interface JournalTaskerInterface { + /** + * @param User $user + */ + public function setUser(User $user); /** * @param TransactionJournal $journal diff --git a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php index aae01702d7..a2da326d86 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php +++ b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php @@ -15,6 +15,7 @@ namespace FireflyIII\Repositories\PiggyBank; use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBankEvent; +use FireflyIII\User; use Illuminate\Support\Collection; /** @@ -98,6 +99,10 @@ interface PiggyBankRepositoryInterface */ public function setOrder(int $piggyBankId, int $order): bool; + /** + * @param User $user + */ + public function setUser(User $user); /** * Store new piggy bank. diff --git a/app/Repositories/Rule/RuleRepositoryInterface.php b/app/Repositories/Rule/RuleRepositoryInterface.php index 518417d94a..887bb20d79 100644 --- a/app/Repositories/Rule/RuleRepositoryInterface.php +++ b/app/Repositories/Rule/RuleRepositoryInterface.php @@ -17,6 +17,7 @@ use FireflyIII\Models\Rule; use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleGroup; use FireflyIII\Models\RuleTrigger; +use FireflyIII\User; /** * Interface RuleRepositoryInterface @@ -25,7 +26,10 @@ use FireflyIII\Models\RuleTrigger; */ interface RuleRepositoryInterface { - + /** + * @param User $user + */ + public function setUser(User $user); /** * @return int */ diff --git a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php index 985a121b92..c365fca704 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php +++ b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php @@ -26,7 +26,6 @@ use Illuminate\Support\Collection; interface RuleGroupRepositoryInterface { - /** * * @@ -92,6 +91,11 @@ interface RuleGroupRepositoryInterface */ public function resetRulesInGroupOrder(RuleGroup $ruleGroup): bool; + /** + * @param User $user + */ + public function setUser(User $user); + /** * @param array $data * diff --git a/app/Repositories/Tag/TagRepositoryInterface.php b/app/Repositories/Tag/TagRepositoryInterface.php index 64bf47c44e..c813a238da 100644 --- a/app/Repositories/Tag/TagRepositoryInterface.php +++ b/app/Repositories/Tag/TagRepositoryInterface.php @@ -16,6 +16,7 @@ namespace FireflyIII\Repositories\Tag; use Carbon\Carbon; use FireflyIII\Models\Tag; use FireflyIII\Models\TransactionJournal; +use FireflyIII\User; use Illuminate\Support\Collection; @@ -26,6 +27,11 @@ use Illuminate\Support\Collection; */ interface TagRepositoryInterface { + /** + * @param User $user + */ + public function setUser(User $user); + /** * This method will connect a journal with a tag. * diff --git a/app/Repositories/User/UserRepositoryInterface.php b/app/Repositories/User/UserRepositoryInterface.php index 93e34a7a14..9e2bb096b3 100644 --- a/app/Repositories/User/UserRepositoryInterface.php +++ b/app/Repositories/User/UserRepositoryInterface.php @@ -24,6 +24,7 @@ use Illuminate\Support\Collection; */ interface UserRepositoryInterface { + /** * Returns a collection of all users. * From 311c1a3c844f2d3ea9bb06d0c74a217fbd015f54 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 16:42:58 +0100 Subject: [PATCH 009/276] Implement all setUser methods. --- app/Repositories/Account/AccountRepository.php | 8 ++++++++ .../Account/AccountRepositoryInterface.php | 10 +++++----- app/Repositories/Account/AccountTasker.php | 12 ++++++++++-- app/Repositories/Account/AccountTaskerInterface.php | 10 +++++----- app/Repositories/Attachment/AttachmentRepository.php | 8 +++++++- app/Repositories/Bill/BillRepository.php | 8 +++++++- app/Repositories/Budget/BudgetRepository.php | 8 +++++++- app/Repositories/Category/CategoryRepository.php | 8 +++++++- app/Repositories/Currency/CurrencyRepository.php | 8 +++++++- app/Repositories/ExportJob/ExportJobRepository.php | 8 +++++++- app/Repositories/ImportJob/ImportJobRepository.php | 8 +++++++- app/Repositories/Journal/JournalRepository.php | 8 +++++++- app/Repositories/Journal/JournalTasker.php | 8 ++++++++ app/Repositories/PiggyBank/PiggyBankRepository.php | 8 +++++++- app/Repositories/Rule/RuleRepository.php | 8 +++++++- app/Repositories/RuleGroup/RuleGroupRepository.php | 8 +++++++- app/Repositories/Tag/TagRepository.php | 8 +++++++- 17 files changed, 120 insertions(+), 24 deletions(-) diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index d740291f68..631157d62c 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -323,6 +323,14 @@ class AccountRepository implements AccountRepositoryInterface return $journal->date; } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * @param array $data * diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php index d19ba94d52..b0ab9b738b 100644 --- a/app/Repositories/Account/AccountRepositoryInterface.php +++ b/app/Repositories/Account/AccountRepositoryInterface.php @@ -27,11 +27,6 @@ use Illuminate\Support\Collection; interface AccountRepositoryInterface { - /** - * @param User $user - */ - public function setUser(User $user); - /** * Moved here from account CRUD. * @@ -130,6 +125,11 @@ interface AccountRepositoryInterface */ public function oldestJournalDate(Account $account): Carbon; + /** + * @param User $user + */ + public function setUser(User $user); + /** * @param array $data * diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.php index 126d084e8d..874ceb7a30 100644 --- a/app/Repositories/Account/AccountTasker.php +++ b/app/Repositories/Account/AccountTasker.php @@ -108,8 +108,8 @@ class AccountTasker implements AccountTaskerInterface */ public function getAccountReport(Collection $accounts, Carbon $start, Carbon $end): array { - $ids = $accounts->pluck('id')->toArray(); - $yesterday = clone $start; + $ids = $accounts->pluck('id')->toArray(); + $yesterday = clone $start; $yesterday->subDay(); $startSet = Steam::balancesById($ids, $yesterday); $endSet = Steam::balancesById($ids, $end); @@ -155,6 +155,14 @@ class AccountTasker implements AccountTaskerInterface return $return; } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * Will return how much money has been going out (ie. spent) by the given account(s). * Alternatively, will return how much money has been coming in (ie. earned) by the given accounts. diff --git a/app/Repositories/Account/AccountTaskerInterface.php b/app/Repositories/Account/AccountTaskerInterface.php index 81ef432b9e..4ea5be74ef 100644 --- a/app/Repositories/Account/AccountTaskerInterface.php +++ b/app/Repositories/Account/AccountTaskerInterface.php @@ -24,11 +24,6 @@ use Illuminate\Support\Collection; */ interface AccountTaskerInterface { - /** - * @param User $user - */ - public function setUser(User $user); - /** * @param Collection $accounts * @param Collection $excluded @@ -62,4 +57,9 @@ interface AccountTaskerInterface */ public function getAccountReport(Collection $accounts, Carbon $start, Carbon $end): array; + /** + * @param User $user + */ + public function setUser(User $user); + } diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php index 1bc9401624..4ee2b458c6 100644 --- a/app/Repositories/Attachment/AttachmentRepository.php +++ b/app/Repositories/Attachment/AttachmentRepository.php @@ -30,7 +30,13 @@ class AttachmentRepository implements AttachmentRepositoryInterface { /** @var User */ private $user; - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * AttachmentRepository constructor. * diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index d3bfa01572..4955145877 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -36,7 +36,13 @@ class BillRepository implements BillRepositoryInterface /** @var User */ private $user; - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * BillRepository constructor. * diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 7c8d2f6391..8d6cde13a8 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -47,7 +47,13 @@ class BudgetRepository implements BudgetRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * @return bool */ diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index 32c2eb2135..7d88329dbe 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -43,7 +43,13 @@ class CategoryRepository implements CategoryRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * @param Category $category * diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index d2eaed1c30..d299bbf4f2 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -39,7 +39,13 @@ class CurrencyRepository implements CurrencyRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * @param TransactionCurrency $currency * diff --git a/app/Repositories/ExportJob/ExportJobRepository.php b/app/Repositories/ExportJob/ExportJobRepository.php index b83818284a..afbdab9248 100644 --- a/app/Repositories/ExportJob/ExportJobRepository.php +++ b/app/Repositories/ExportJob/ExportJobRepository.php @@ -38,7 +38,13 @@ class ExportJobRepository implements ExportJobRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * @param ExportJob $job * @param string $status diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php index d7f4ac30cf..88d54f4a81 100644 --- a/app/Repositories/ImportJob/ImportJobRepository.php +++ b/app/Repositories/ImportJob/ImportJobRepository.php @@ -37,7 +37,13 @@ class ImportJobRepository implements ImportJobRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * @param string $fileType * diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index 9ee336cddf..aa28551d4c 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -52,7 +52,13 @@ class JournalRepository implements JournalRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * @param TransactionJournal $journal * @param TransactionType $type diff --git a/app/Repositories/Journal/JournalTasker.php b/app/Repositories/Journal/JournalTasker.php index eb77c77e6f..5f9f610ca1 100644 --- a/app/Repositories/Journal/JournalTasker.php +++ b/app/Repositories/Journal/JournalTasker.php @@ -152,6 +152,14 @@ class JournalTasker implements JournalTaskerInterface return $transactions; } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * Collect the balance of an account before the given transaction has hit. This is tricky, because * the balance does not depend on the transaction itself but the journal it's part of. And of course diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index 5a9f07704c..fad4b0f4fa 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -41,7 +41,13 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * @param PiggyBank $piggyBank * @param string $amount diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index 4b7ce00433..05849acd5d 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -39,7 +39,13 @@ class RuleRepository implements RuleRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * @return int */ diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php index b294e19937..7a6afa6f0e 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepository.php +++ b/app/Repositories/RuleGroup/RuleGroupRepository.php @@ -39,7 +39,13 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * @return int */ diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 8145be1151..a344da412a 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -43,7 +43,13 @@ class TagRepository implements TagRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * * @param TransactionJournal $journal From 1e947870a613dfc2903eebbbcca94c04a51a40a0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 16:46:30 +0100 Subject: [PATCH 010/276] Remove all constructors. --- .../Account/AccountRepository.php | 10 ------- app/Repositories/Account/AccountTasker.php | 10 ------- .../Attachment/AttachmentRepository.php | 26 +++++++------------ .../AttachmentRepositoryInterface.php | 10 +++---- app/Repositories/Bill/BillRepository.php | 24 ++++++----------- .../Bill/BillRepositoryInterface.php | 10 +++---- app/Repositories/Budget/BudgetRepository.php | 24 ++++++----------- .../Budget/BudgetRepositoryInterface.php | 10 +++---- .../Category/CategoryRepository.php | 24 ++++++----------- .../Category/CategoryRepositoryInterface.php | 10 +++---- .../Currency/CurrencyRepository.php | 10 +------ .../Currency/CurrencyRepositoryInterface.php | 10 +++---- .../ExportJob/ExportJobRepository.php | 24 ++++++----------- .../ExportJobRepositoryInterface.php | 10 +++---- .../ImportJob/ImportJobRepository.php | 24 ++++++----------- .../ImportJobRepositoryInterface.php | 10 +++---- .../Journal/JournalRepository.php | 10 +------ .../Journal/JournalRepositoryInterface.php | 18 ++++++------- app/Repositories/Journal/JournalTasker.php | 9 ------- .../Journal/JournalTaskerInterface.php | 10 +++---- .../PiggyBank/PiggyBankRepository.php | 24 ++++++----------- app/Repositories/Rule/RuleRepository.php | 24 ++++++----------- .../Rule/RuleRepositoryInterface.php | 9 ++++--- .../RuleGroup/RuleGroupRepository.php | 10 +------ app/Repositories/Tag/TagRepository.php | 10 +------ .../Tag/TagRepositoryInterface.php | 10 +++---- 26 files changed, 128 insertions(+), 252 deletions(-) diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 631157d62c..26ba26b6ea 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -43,16 +43,6 @@ class AccountRepository implements AccountRepositoryInterface /** @var array */ private $validFields = ['accountRole', 'ccMonthlyPaymentDate', 'ccType', 'accountNumber', 'currency_id', 'BIC']; - /** - * AttachmentRepository constructor. - * - * @param User $user - */ - public function __construct(User $user) - { - $this->user = $user; - } - /** * Moved here from account CRUD * diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.php index 874ceb7a30..d43902e094 100644 --- a/app/Repositories/Account/AccountTasker.php +++ b/app/Repositories/Account/AccountTasker.php @@ -31,16 +31,6 @@ class AccountTasker implements AccountTaskerInterface /** @var User */ private $user; - /** - * AttachmentRepository constructor. - * - * @param User $user - */ - public function __construct(User $user) - { - $this->user = $user; - } - /** * @see self::amountInPeriod * diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php index 4ee2b458c6..79a481e4ab 100644 --- a/app/Repositories/Attachment/AttachmentRepository.php +++ b/app/Repositories/Attachment/AttachmentRepository.php @@ -14,12 +14,12 @@ declare(strict_types = 1); namespace FireflyIII\Repositories\Attachment; use Carbon\Carbon; +use Crypt; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Models\Attachment; use FireflyIII\User; use Illuminate\Support\Collection; use Storage; -use Crypt; /** * Class AttachmentRepository @@ -30,22 +30,6 @@ class AttachmentRepository implements AttachmentRepositoryInterface { /** @var User */ private $user; - /** - * @param User $user - */ - public function setUser(User $user) - { - $this->user = $user; - } - /** - * AttachmentRepository constructor. - * - * @param User $user - */ - public function __construct(User $user) - { - $this->user = $user; - } /** * @param Attachment $attachment @@ -123,6 +107,14 @@ class AttachmentRepository implements AttachmentRepositoryInterface return ''; } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * @param Attachment $attachment * @param array $data diff --git a/app/Repositories/Attachment/AttachmentRepositoryInterface.php b/app/Repositories/Attachment/AttachmentRepositoryInterface.php index 25dc72ff38..cc7cb887f8 100644 --- a/app/Repositories/Attachment/AttachmentRepositoryInterface.php +++ b/app/Repositories/Attachment/AttachmentRepositoryInterface.php @@ -26,11 +26,6 @@ use Illuminate\Support\Collection; interface AttachmentRepositoryInterface { - /** - * @param User $user - */ - public function setUser(User $user); - /** * @param Attachment $attachment * @@ -65,6 +60,11 @@ interface AttachmentRepositoryInterface */ public function getContent(Attachment $attachment): string; + /** + * @param User $user + */ + public function setUser(User $user); + /** * @param Attachment $attachment * @param array $attachmentData diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index 4955145877..545a29fb96 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -36,22 +36,6 @@ class BillRepository implements BillRepositoryInterface /** @var User */ private $user; - /** - * @param User $user - */ - public function setUser(User $user) - { - $this->user = $user; - } - /** - * BillRepository constructor. - * - * @param User $user - */ - public function __construct(User $user) - { - $this->user = $user; - } /** * @param Bill $bill @@ -526,6 +510,14 @@ class BillRepository implements BillRepositoryInterface } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * @param array $data * diff --git a/app/Repositories/Bill/BillRepositoryInterface.php b/app/Repositories/Bill/BillRepositoryInterface.php index af6dd36dab..2e07d12d93 100644 --- a/app/Repositories/Bill/BillRepositoryInterface.php +++ b/app/Repositories/Bill/BillRepositoryInterface.php @@ -26,11 +26,6 @@ use Illuminate\Support\Collection; */ interface BillRepositoryInterface { - /** - * @param User $user - */ - public function setUser(User $user); - /** * @param Bill $bill * @@ -164,6 +159,11 @@ interface BillRepositoryInterface */ public function scan(Bill $bill, TransactionJournal $journal): bool; + /** + * @param User $user + */ + public function setUser(User $user); + /** * @param array $data * diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 8d6cde13a8..8f0588dc1a 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -38,22 +38,6 @@ class BudgetRepository implements BudgetRepositoryInterface /** @var User */ private $user; - /** - * BudgetRepository constructor. - * - * @param User $user - */ - public function __construct(User $user) - { - $this->user = $user; - } - /** - * @param User $user - */ - public function setUser(User $user) - { - $this->user = $user; - } /** * @return bool */ @@ -439,6 +423,14 @@ class BudgetRepository implements BudgetRepositoryInterface return true; } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * @param Collection $budgets * @param Collection $accounts diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index 3eefa19b01..906a4827ae 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -27,11 +27,6 @@ use Illuminate\Support\Collection; */ interface BudgetRepositoryInterface { - /** - * @param User $user - */ - public function setUser(User $user); - /** * @return bool */ @@ -154,6 +149,11 @@ interface BudgetRepositoryInterface */ public function setAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end, string $amount): bool; + /** + * @param User $user + */ + public function setUser(User $user); + /** * @param Collection $budgets * @param Collection $accounts diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index 7d88329dbe..fb366c0812 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -34,22 +34,6 @@ class CategoryRepository implements CategoryRepositoryInterface /** @var User */ private $user; - /** - * CategoryRepository constructor. - * - * @param User $user - */ - public function __construct(User $user) - { - $this->user = $user; - } - /** - * @param User $user - */ - public function setUser(User $user) - { - $this->user = $user; - } /** * @param Category $category * @@ -390,6 +374,14 @@ class CategoryRepository implements CategoryRepositoryInterface return $result; } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * @param Collection $categories * @param Collection $accounts diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php index 80b42d6852..9e89a78f50 100644 --- a/app/Repositories/Category/CategoryRepositoryInterface.php +++ b/app/Repositories/Category/CategoryRepositoryInterface.php @@ -25,11 +25,6 @@ use Illuminate\Support\Collection; */ interface CategoryRepositoryInterface { - /** - * @param User $user - */ - public function setUser(User $user); - /** * @param Category $category * @@ -127,6 +122,11 @@ interface CategoryRepositoryInterface */ public function periodIncomeNoCategory(Collection $accounts, Carbon $start, Carbon $end): array; + /** + * @param User $user + */ + public function setUser(User $user); + /** * @param Collection $categories * @param Collection $accounts diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index d299bbf4f2..bb1444d73c 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -30,15 +30,6 @@ class CurrencyRepository implements CurrencyRepositoryInterface /** @var User */ private $user; - /** - * CategoryRepository constructor. - * - * @param User $user - */ - public function __construct(User $user) - { - $this->user = $user; - } /** * @param User $user */ @@ -46,6 +37,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface { $this->user = $user; } + /** * @param TransactionCurrency $currency * diff --git a/app/Repositories/Currency/CurrencyRepositoryInterface.php b/app/Repositories/Currency/CurrencyRepositoryInterface.php index 9c63c1fbfc..63eb9bf0b5 100644 --- a/app/Repositories/Currency/CurrencyRepositoryInterface.php +++ b/app/Repositories/Currency/CurrencyRepositoryInterface.php @@ -26,11 +26,6 @@ use Illuminate\Support\Collection; */ interface CurrencyRepositoryInterface { - /** - * @param User $user - */ - public function setUser(User $user); - /** * @param TransactionCurrency $currency * @@ -100,6 +95,11 @@ interface CurrencyRepositoryInterface */ public function getCurrencyByPreference(Preference $preference): TransactionCurrency; + /** + * @param User $user + */ + public function setUser(User $user); + /** * @param array $data * diff --git a/app/Repositories/ExportJob/ExportJobRepository.php b/app/Repositories/ExportJob/ExportJobRepository.php index afbdab9248..aa956f901e 100644 --- a/app/Repositories/ExportJob/ExportJobRepository.php +++ b/app/Repositories/ExportJob/ExportJobRepository.php @@ -29,22 +29,6 @@ class ExportJobRepository implements ExportJobRepositoryInterface /** @var User */ private $user; - /** - * ExportJobRepository constructor. - * - * @param User $user - */ - public function __construct(User $user) - { - $this->user = $user; - } - /** - * @param User $user - */ - public function setUser(User $user) - { - $this->user = $user; - } /** * @param ExportJob $job * @param string $status @@ -155,4 +139,12 @@ class ExportJobRepository implements ExportJobRepositoryInterface return $content; } + + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } } diff --git a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php index 484e8496b5..7e93663ea5 100644 --- a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php +++ b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php @@ -23,11 +23,6 @@ use FireflyIII\User; */ interface ExportJobRepositoryInterface { - /** - * @param User $user - */ - public function setUser(User $user); - /** * @param ExportJob $job * @param string $status @@ -67,4 +62,9 @@ interface ExportJobRepositoryInterface */ public function getContent(ExportJob $job): string; + /** + * @param User $user + */ + public function setUser(User $user); + } diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php index 88d54f4a81..0eec759e5b 100644 --- a/app/Repositories/ImportJob/ImportJobRepository.php +++ b/app/Repositories/ImportJob/ImportJobRepository.php @@ -28,22 +28,6 @@ class ImportJobRepository implements ImportJobRepositoryInterface /** @var User */ private $user; - /** - * ExportJobRepository constructor. - * - * @param User $user - */ - public function __construct(User $user) - { - $this->user = $user; - } - /** - * @param User $user - */ - public function setUser(User $user) - { - $this->user = $user; - } /** * @param string $fileType * @@ -101,4 +85,12 @@ class ImportJobRepository implements ImportJobRepositoryInterface return $result; } + + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } } diff --git a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php index b58468f1af..5bb2149fbe 100644 --- a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php +++ b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php @@ -23,11 +23,6 @@ use FireflyIII\User; */ interface ImportJobRepositoryInterface { - /** - * @param User $user - */ - public function setUser(User $user); - /** * @param string $fileType * @@ -41,4 +36,9 @@ interface ImportJobRepositoryInterface * @return ImportJob */ public function findByKey(string $key): ImportJob; + + /** + * @param User $user + */ + public function setUser(User $user); } diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index aa28551d4c..12ce898ff1 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -43,15 +43,6 @@ class JournalRepository implements JournalRepositoryInterface /** @var array */ private $validMetaFields = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date', 'internal_reference', 'notes']; - /** - * JournalRepository constructor. - * - * @param User $user - */ - public function __construct(User $user) - { - $this->user = $user; - } /** * @param User $user */ @@ -59,6 +50,7 @@ class JournalRepository implements JournalRepositoryInterface { $this->user = $user; } + /** * @param TransactionJournal $journal * @param TransactionType $type diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php index 446d21c184..f1f5438ad4 100644 --- a/app/Repositories/Journal/JournalRepositoryInterface.php +++ b/app/Repositories/Journal/JournalRepositoryInterface.php @@ -27,10 +27,6 @@ use Illuminate\Support\MessageBag; */ interface JournalRepositoryInterface { - /** - * @param User $user - */ - public function setUser(User $user); /** * @param TransactionJournal $journal * @param TransactionType $type @@ -41,11 +37,6 @@ interface JournalRepositoryInterface */ public function convert(TransactionJournal $journal, TransactionType $type, Account $source, Account $destination): MessageBag; - /** - * @return Collection - */ - public function getTransactionTypes(): Collection; - /** * Deletes a journal. * @@ -71,6 +62,15 @@ interface JournalRepositoryInterface */ public function first(): TransactionJournal; + /** + * @return Collection + */ + public function getTransactionTypes(): Collection; + + /** + * @param User $user + */ + public function setUser(User $user); /** * @param array $data diff --git a/app/Repositories/Journal/JournalTasker.php b/app/Repositories/Journal/JournalTasker.php index 5f9f610ca1..c0424242c8 100644 --- a/app/Repositories/Journal/JournalTasker.php +++ b/app/Repositories/Journal/JournalTasker.php @@ -35,15 +35,6 @@ class JournalTasker implements JournalTaskerInterface /** @var User */ private $user; - /** - * JournalRepository constructor. - * - * @param User $user - */ - public function __construct(User $user) - { - $this->user = $user; - } /** * @param TransactionJournal $journal diff --git a/app/Repositories/Journal/JournalTaskerInterface.php b/app/Repositories/Journal/JournalTaskerInterface.php index e5c007c1e7..1273f69c3a 100644 --- a/app/Repositories/Journal/JournalTaskerInterface.php +++ b/app/Repositories/Journal/JournalTaskerInterface.php @@ -25,11 +25,6 @@ use Illuminate\Support\Collection; */ interface JournalTaskerInterface { - /** - * @param User $user - */ - public function setUser(User $user); - /** * @param TransactionJournal $journal * @@ -46,4 +41,9 @@ interface JournalTaskerInterface * @return array */ public function getTransactionsOverview(TransactionJournal $journal): array; + + /** + * @param User $user + */ + public function setUser(User $user); } diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index fad4b0f4fa..1f14467a5b 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -32,22 +32,6 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface /** @var User */ private $user; - /** - * PiggyBankRepository constructor. - * - * @param User $user - */ - public function __construct(User $user) - { - $this->user = $user; - } - /** - * @param User $user - */ - public function setUser(User $user) - { - $this->user = $user; - } /** * @param PiggyBank $piggyBank * @param string $amount @@ -173,6 +157,14 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface return true; } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * @param array $data * diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index 05849acd5d..7e0487be63 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -30,22 +30,6 @@ class RuleRepository implements RuleRepositoryInterface /** @var User */ private $user; - /** - * BillRepository constructor. - * - * @param User $user - */ - public function __construct(User $user) - { - $this->user = $user; - } - /** - * @param User $user - */ - public function setUser(User $user) - { - $this->user = $user; - } /** * @return int */ @@ -224,6 +208,14 @@ class RuleRepository implements RuleRepositoryInterface } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * @param array $data * diff --git a/app/Repositories/Rule/RuleRepositoryInterface.php b/app/Repositories/Rule/RuleRepositoryInterface.php index 887bb20d79..6ca1456214 100644 --- a/app/Repositories/Rule/RuleRepositoryInterface.php +++ b/app/Repositories/Rule/RuleRepositoryInterface.php @@ -26,10 +26,6 @@ use FireflyIII\User; */ interface RuleRepositoryInterface { - /** - * @param User $user - */ - public function setUser(User $user); /** * @return int */ @@ -98,6 +94,11 @@ interface RuleRepositoryInterface */ public function resetRulesInGroupOrder(RuleGroup $ruleGroup): bool; + /** + * @param User $user + */ + public function setUser(User $user); + /** * @param array $data * diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php index 7a6afa6f0e..e413987334 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepository.php +++ b/app/Repositories/RuleGroup/RuleGroupRepository.php @@ -30,15 +30,6 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface /** @var User */ private $user; - /** - * BillRepository constructor. - * - * @param User $user - */ - public function __construct(User $user) - { - $this->user = $user; - } /** * @param User $user */ @@ -46,6 +37,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface { $this->user = $user; } + /** * @return int */ diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index a344da412a..1b0950467f 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -34,15 +34,6 @@ class TagRepository implements TagRepositoryInterface /** @var User */ private $user; - /** - * TagRepository constructor. - * - * @param User $user - */ - public function __construct(User $user) - { - $this->user = $user; - } /** * @param User $user */ @@ -50,6 +41,7 @@ class TagRepository implements TagRepositoryInterface { $this->user = $user; } + /** * * @param TransactionJournal $journal diff --git a/app/Repositories/Tag/TagRepositoryInterface.php b/app/Repositories/Tag/TagRepositoryInterface.php index c813a238da..b360e7d436 100644 --- a/app/Repositories/Tag/TagRepositoryInterface.php +++ b/app/Repositories/Tag/TagRepositoryInterface.php @@ -27,11 +27,6 @@ use Illuminate\Support\Collection; */ interface TagRepositoryInterface { - /** - * @param User $user - */ - public function setUser(User $user); - /** * This method will connect a journal with a tag. * @@ -95,6 +90,11 @@ interface TagRepositoryInterface */ public function lastUseDate(Tag $tag): Carbon; + /** + * @param User $user + */ + public function setUser(User $user); + /** * @param Tag $tag * @param Carbon $start From c7341c9194def617df53f35aca61c6d1fbd1512c Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 16:57:00 +0100 Subject: [PATCH 011/276] Also extend collector. --- app/Helpers/Collector/JournalCollector.php | 15 ++++++++++----- .../Collector/JournalCollectorInterface.php | 4 +++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php index c198da7764..f706508183 100644 --- a/app/Helpers/Collector/JournalCollector.php +++ b/app/Helpers/Collector/JournalCollector.php @@ -98,12 +98,9 @@ class JournalCollector implements JournalCollectorInterface /** * JournalCollector constructor. - * - * @param User $user */ - public function __construct(User $user) + public function __construct() { - $this->user = $user; $this->query = $this->startQuery(); } @@ -168,7 +165,7 @@ class JournalCollector implements JournalCollectorInterface { $this->run = true; /** @var Collection $set */ - $set = $this->query->get(array_values($this->fields)); + $set = $this->query->get(array_values($this->fields)); Log::debug(sprintf('Count of set is %d', $set->count())); $set = $this->filterTransfers($set); Log::debug(sprintf('Count of set after filterTransfers() is %d', $set->count())); @@ -456,6 +453,14 @@ class JournalCollector implements JournalCollectorInterface return $this; } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * @return JournalCollectorInterface */ diff --git a/app/Helpers/Collector/JournalCollectorInterface.php b/app/Helpers/Collector/JournalCollectorInterface.php index b3307ebac0..5b19faeaa3 100644 --- a/app/Helpers/Collector/JournalCollectorInterface.php +++ b/app/Helpers/Collector/JournalCollectorInterface.php @@ -17,6 +17,7 @@ use Carbon\Carbon; use FireflyIII\Models\Budget; use FireflyIII\Models\Category; use FireflyIII\Models\Tag; +use FireflyIII\User; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -84,7 +85,6 @@ interface JournalCollectorInterface */ public function setBudget(Budget $budget): JournalCollectorInterface; - /** * @param Collection $budgets * @@ -149,6 +149,8 @@ interface JournalCollectorInterface */ public function setTypes(array $types): JournalCollectorInterface; + public function setUser(User $user); + /** * @return JournalCollectorInterface */ From 01468c2663cdf3ebb7d5c77bb5dca4036d22389d Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 16:58:10 +0100 Subject: [PATCH 012/276] Rewrote journal service provider --- app/Providers/JournalServiceProvider.php | 55 +++++++++++++----------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/app/Providers/JournalServiceProvider.php b/app/Providers/JournalServiceProvider.php index 2ac7f61f64..6f22587325 100644 --- a/app/Providers/JournalServiceProvider.php +++ b/app/Providers/JournalServiceProvider.php @@ -14,7 +14,12 @@ declare(strict_types = 1); namespace FireflyIII\Providers; -use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Helpers\Collector\JournalCollector; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Repositories\Journal\JournalRepository; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalTasker; +use FireflyIII\Repositories\Journal\JournalTaskerInterface; use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; @@ -50,16 +55,16 @@ class JournalServiceProvider extends ServiceProvider private function registerCollector() { $this->app->bind( - 'FireflyIII\Helpers\Collector\JournalCollectorInterface', - function (Application $app, array $arguments) { - if (!isset($arguments[0]) && $app->auth->check()) { - return app('FireflyIII\Helpers\Collector\JournalCollector', [auth()->user()]); - } - if (!isset($arguments[0]) && !$app->auth->check()) { - throw new FireflyException('There is no user present.'); + JournalCollectorInterface::class, + function (Application $app) { + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollector::class); + + if ($app->auth->check()) { + $collector->setUser(auth()->user()); } - return app('FireflyIII\Helpers\Collector\JournalCollector', $arguments); + return $collector; } ); } @@ -67,16 +72,16 @@ class JournalServiceProvider extends ServiceProvider private function registerRepository() { $this->app->bind( - 'FireflyIII\Repositories\Journal\JournalRepositoryInterface', - function (Application $app, array $arguments) { - if (!isset($arguments[0]) && $app->auth->check()) { - return app('FireflyIII\Repositories\Journal\JournalRepository', [auth()->user()]); - } - if (!isset($arguments[0]) && !$app->auth->check()) { - throw new FireflyException('There is no user present.'); + JournalRepositoryInterface::class, + function (Application $app) { + /** @var JournalRepositoryInterface $repository */ + $repository = app(JournalRepository::class); + if ($app->auth->check()) { + + $repository->setUser(auth()->user()); } - return app('FireflyIII\Repositories\Journal\JournalRepository', $arguments); + return $repository; } ); } @@ -84,16 +89,16 @@ class JournalServiceProvider extends ServiceProvider private function registerTasker() { $this->app->bind( - 'FireflyIII\Repositories\Journal\JournalTaskerInterface', - function (Application $app, array $arguments) { - if (!isset($arguments[0]) && $app->auth->check()) { - return app('FireflyIII\Repositories\Journal\JournalTasker', [auth()->user()]); - } - if (!isset($arguments[0]) && !$app->auth->check()) { - throw new FireflyException('There is no user present.'); + JournalTaskerInterface::class, + function (Application $app) { + /** @var JournalTaskerInterface $tasker */ + $tasker = app(JournalTasker::class); + + if ($app->auth->check()) { + $tasker->setUser(auth()->user()); } - return app('FireflyIII\Repositories\Journal\JournalTasker', $arguments); + return $tasker; } ); } From 355baa7fef65a8e52803dc393f2743aeaefa0242 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 16:59:55 +0100 Subject: [PATCH 013/276] Rewrote account service provider. --- app/Providers/AccountServiceProvider.php | 39 ++++++++++++------------ 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/app/Providers/AccountServiceProvider.php b/app/Providers/AccountServiceProvider.php index 0ce5a90329..3035731adb 100644 --- a/app/Providers/AccountServiceProvider.php +++ b/app/Providers/AccountServiceProvider.php @@ -14,7 +14,10 @@ declare(strict_types = 1); namespace FireflyIII\Providers; -use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Repositories\Account\AccountRepository; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Account\AccountTasker; +use FireflyIII\Repositories\Account\AccountTaskerInterface; use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; @@ -44,8 +47,6 @@ class AccountServiceProvider extends ServiceProvider { $this->registerRepository(); $this->registerTasker(); - - } /** @@ -54,16 +55,16 @@ class AccountServiceProvider extends ServiceProvider private function registerRepository() { $this->app->bind( - 'FireflyIII\Repositories\Account\AccountRepositoryInterface', - function (Application $app, array $arguments) { - if (!isset($arguments[0]) && $app->auth->check()) { - return app('FireflyIII\Repositories\Account\AccountRepository', [auth()->user()]); - } - if (!isset($arguments[0]) && !$app->auth->check()) { - throw new FireflyException('There is no user present.'); + AccountRepositoryInterface::class, + function (Application $app) { + /** @var AccountRepositoryInterface $repository */ + $repository = app(AccountRepository::class); + + if ($app->auth->check()) { + $repository->setUser(auth()->user()); } - return app('FireflyIII\Repositories\Account\AccountRepository', $arguments); + return $repository; } ); } @@ -74,16 +75,16 @@ class AccountServiceProvider extends ServiceProvider private function registerTasker() { $this->app->bind( - 'FireflyIII\Repositories\Account\AccountTaskerInterface', - function (Application $app, array $arguments) { - if (!isset($arguments[0]) && $app->auth->check()) { - return app('FireflyIII\Repositories\Account\AccountTasker', [auth()->user()]); - } - if (!isset($arguments[0]) && !$app->auth->check()) { - throw new FireflyException('There is no user present.'); + AccountTaskerInterface::class, + function (Application $app) { + /** @var AccountTaskerInterface $tasker */ + $tasker = app(AccountTasker::class); + + if ($app->auth->check()) { + $tasker->setUser(auth()->user()); } - return app('FireflyIII\Repositories\Account\AccountTasker', $arguments); + return $tasker; } ); } From 2c786e6a3831d3333d2130f5fadd302b379c7aae Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 17:09:44 +0100 Subject: [PATCH 014/276] Small fixes to collector because constructor is gone. --- app/Helpers/Collector/JournalCollector.php | 54 ++++++++----------- .../Collector/JournalCollectorInterface.php | 6 ++- 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php index f706508183..7952ed2e2f 100644 --- a/app/Helpers/Collector/JournalCollector.php +++ b/app/Helpers/Collector/JournalCollector.php @@ -96,14 +96,6 @@ class JournalCollector implements JournalCollectorInterface /** @var User */ private $user; - /** - * JournalCollector constructor. - */ - public function __construct() - { - $this->query = $this->startQuery(); - } - /** * @return int * @throws FireflyException @@ -461,6 +453,29 @@ class JournalCollector implements JournalCollectorInterface $this->user = $user; } + /** + * + */ + public function startQuery() + { + /** @var EloquentBuilder $query */ + $query = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') + ->leftJoin('transaction_currencies', 'transaction_currencies.id', 'transaction_journals.transaction_currency_id') + ->leftJoin('transaction_types', 'transaction_types.id', 'transaction_journals.transaction_type_id') + ->leftJoin('bills', 'bills.id', 'transaction_journals.bill_id') + ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') + ->leftJoin('account_types', 'accounts.account_type_id', 'account_types.id') + ->whereNull('transactions.deleted_at') + ->whereNull('transaction_journals.deleted_at') + ->where('transaction_journals.user_id', $this->user->id) + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order', 'ASC') + ->orderBy('transaction_journals.id', 'DESC'); + + $this->query = $query; + + } + /** * @return JournalCollectorInterface */ @@ -734,27 +749,4 @@ class JournalCollector implements JournalCollectorInterface $this->query->leftJoin('tag_transaction_journal', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id'); } } - - /** - * @return EloquentBuilder - */ - private function startQuery(): EloquentBuilder - { - /** @var EloquentBuilder $query */ - $query = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') - ->leftJoin('transaction_currencies', 'transaction_currencies.id', 'transaction_journals.transaction_currency_id') - ->leftJoin('transaction_types', 'transaction_types.id', 'transaction_journals.transaction_type_id') - ->leftJoin('bills', 'bills.id', 'transaction_journals.bill_id') - ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') - ->leftJoin('account_types', 'accounts.account_type_id', 'account_types.id') - ->whereNull('transactions.deleted_at') - ->whereNull('transaction_journals.deleted_at') - ->where('transaction_journals.user_id', $this->user->id) - ->orderBy('transaction_journals.date', 'DESC') - ->orderBy('transaction_journals.order', 'ASC') - ->orderBy('transaction_journals.id', 'DESC'); - - return $query; - - } } diff --git a/app/Helpers/Collector/JournalCollectorInterface.php b/app/Helpers/Collector/JournalCollectorInterface.php index 5b19faeaa3..80e41eb781 100644 --- a/app/Helpers/Collector/JournalCollectorInterface.php +++ b/app/Helpers/Collector/JournalCollectorInterface.php @@ -28,7 +28,6 @@ use Illuminate\Support\Collection; */ interface JournalCollectorInterface { - /** * @return int */ @@ -151,6 +150,11 @@ interface JournalCollectorInterface public function setUser(User $user); + /** + * + */ + public function startQuery(); + /** * @return JournalCollectorInterface */ From 3aaf356054456c8d4fd7e82461f8295154ae4772 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 17:10:08 +0100 Subject: [PATCH 015/276] Rewrote bill service provider --- app/Providers/BillServiceProvider.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/Providers/BillServiceProvider.php b/app/Providers/BillServiceProvider.php index 7275348a8d..a07e8e37ff 100644 --- a/app/Providers/BillServiceProvider.php +++ b/app/Providers/BillServiceProvider.php @@ -14,7 +14,8 @@ declare(strict_types = 1); namespace FireflyIII\Providers; -use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Repositories\Bill\BillRepository; +use FireflyIII\Repositories\Bill\BillRepositoryInterface; use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; @@ -43,16 +44,16 @@ class BillServiceProvider extends ServiceProvider public function register() { $this->app->bind( - 'FireflyIII\Repositories\Bill\BillRepositoryInterface', - function (Application $app, array $arguments) { - if (!isset($arguments[0]) && $app->auth->check()) { - return app('FireflyIII\Repositories\Bill\BillRepository', [auth()->user()]); - } - if (!isset($arguments[0]) && !$app->auth->check()) { - throw new FireflyException('There is no user present.'); + BillRepositoryInterface::class, + function (Application $app) { + /** @var BillRepositoryInterface $repository */ + $repository = app(BillRepository::class); + + if ($app->auth->check()) { + $repository->setUser(auth()->user()); } - return app('FireflyIII\Repositories\Bill\BillRepository', $arguments); + return $repository; } ); } From ac54032f558da08a777771dc68cc1426ff2a0734 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 17:10:23 +0100 Subject: [PATCH 016/276] Need to call everything from collector to work. --- app/Providers/JournalServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Providers/JournalServiceProvider.php b/app/Providers/JournalServiceProvider.php index 6f22587325..b44c11b760 100644 --- a/app/Providers/JournalServiceProvider.php +++ b/app/Providers/JournalServiceProvider.php @@ -59,10 +59,10 @@ class JournalServiceProvider extends ServiceProvider function (Application $app) { /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollector::class); - if ($app->auth->check()) { $collector->setUser(auth()->user()); } + $collector->startQuery(); return $collector; } From 646ed0d4dd309578e540ff92cb4bc71d0cf351d9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 17:19:51 +0100 Subject: [PATCH 017/276] Rewrote attachment, budget and category service providers. --- app/Providers/AttachmentServiceProvider.php | 18 +++++++++--------- app/Providers/BudgetServiceProvider.php | 18 +++++++++--------- app/Providers/CategoryServiceProvider.php | 18 +++++++++--------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/app/Providers/AttachmentServiceProvider.php b/app/Providers/AttachmentServiceProvider.php index 77debb7354..c9f3a9d48d 100644 --- a/app/Providers/AttachmentServiceProvider.php +++ b/app/Providers/AttachmentServiceProvider.php @@ -14,7 +14,8 @@ declare(strict_types = 1); namespace FireflyIII\Providers; -use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Repositories\Attachment\AttachmentRepository; +use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface; use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; @@ -43,16 +44,15 @@ class AttachmentServiceProvider extends ServiceProvider public function register() { $this->app->bind( - 'FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface', - function (Application $app, array $arguments) { - if (!isset($arguments[0]) && $app->auth->check()) { - return app('FireflyIII\Repositories\Attachment\AttachmentRepository', [auth()->user()]); - } - if (!isset($arguments[0]) && !$app->auth->check()) { - throw new FireflyException('There is no user present.'); + AttachmentRepositoryInterface::class, + function (Application $app) { + /** @var AttachmentRepositoryInterface $repository */ + $repository = app(AttachmentRepository::class); + if ($app->auth->check()) { + $repository->setUser(auth()->user()); } - return app('FireflyIII\Repositories\Attachment\AttachmentRepository', $arguments); + return $repository; } ); } diff --git a/app/Providers/BudgetServiceProvider.php b/app/Providers/BudgetServiceProvider.php index 51408c5098..df87739ea6 100644 --- a/app/Providers/BudgetServiceProvider.php +++ b/app/Providers/BudgetServiceProvider.php @@ -14,7 +14,8 @@ declare(strict_types = 1); namespace FireflyIII\Providers; -use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Repositories\Budget\BudgetRepository; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; @@ -43,16 +44,15 @@ class BudgetServiceProvider extends ServiceProvider public function register() { $this->app->bind( - 'FireflyIII\Repositories\Budget\BudgetRepositoryInterface', - function (Application $app, array $arguments) { - if (!isset($arguments[0]) && $app->auth->check()) { - return app('FireflyIII\Repositories\Budget\BudgetRepository', [auth()->user()]); - } - if (!isset($arguments[0]) && !$app->auth->check()) { - throw new FireflyException('There is no user present.'); + BudgetRepositoryInterface::class, + function (Application $app) { + /** @var BudgetRepositoryInterface $repository */ + $repository = app(BudgetRepository::class); + if ($app->auth->check()) { + $repository->setUser(auth()->user()); } - return app('FireflyIII\Repositories\Budget\BudgetRepository', $arguments); + return $repository; } ); } diff --git a/app/Providers/CategoryServiceProvider.php b/app/Providers/CategoryServiceProvider.php index a3deb55f30..bdac9c91f1 100644 --- a/app/Providers/CategoryServiceProvider.php +++ b/app/Providers/CategoryServiceProvider.php @@ -14,7 +14,8 @@ declare(strict_types = 1); namespace FireflyIII\Providers; -use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Repositories\Category\CategoryRepository; +use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; @@ -43,16 +44,15 @@ class CategoryServiceProvider extends ServiceProvider public function register() { $this->app->bind( - 'FireflyIII\Repositories\Category\CategoryRepositoryInterface', - function (Application $app, array $arguments) { - if (!isset($arguments[0]) && $app->auth->check()) { - return app('FireflyIII\Repositories\Category\CategoryRepository', [auth()->user()]); - } - if (!isset($arguments[0]) && !$app->auth->check()) { - throw new FireflyException('There is no user present.'); + CategoryRepositoryInterface::class, + function (Application $app) { + /** @var CategoryRepository $repository */ + $repository = app(CategoryRepository::class); + if ($app->auth->check()) { + $repository->setUser(auth()->user()); } - return app('FireflyIII\Repositories\Category\CategoryRepository', $arguments); + return $repository; } ); From eeae4d215dc256417e498180903441050cf39e21 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 17:20:00 +0100 Subject: [PATCH 018/276] Removed old service provider. --- app/Providers/CrudServiceProvider.php | 64 --------------------------- 1 file changed, 64 deletions(-) delete mode 100644 app/Providers/CrudServiceProvider.php diff --git a/app/Providers/CrudServiceProvider.php b/app/Providers/CrudServiceProvider.php deleted file mode 100644 index 93acfa1412..0000000000 --- a/app/Providers/CrudServiceProvider.php +++ /dev/null @@ -1,64 +0,0 @@ -registerJournal(); - } - - private function registerJournal() - { - $this->app->bind( - 'FireflyIII\Crud\Split\JournalInterface', - function (Application $app, array $arguments) { - if (!isset($arguments[0]) && $app->auth->check()) { - return app('FireflyIII\Crud\Split\Journal', [auth()->user()]); - } - if (!isset($arguments[0]) && !$app->auth->check()) { - throw new FireflyException('There is no user present.'); - } - - return app('FireflyIII\Crud\Split\Journal', $arguments); - } - ); - - } -} From 8263fa41dd7b95f0e115ea29ee61ca35c18b37f8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 17:29:05 +0100 Subject: [PATCH 019/276] Rewrote currency and export/import job service provider --- app/Providers/CurrencyServiceProvider.php | 18 ++++++++-------- app/Providers/ExportJobServiceProvider.php | 24 +++++++++++----------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/Providers/CurrencyServiceProvider.php b/app/Providers/CurrencyServiceProvider.php index d95532e072..bfdf535c70 100644 --- a/app/Providers/CurrencyServiceProvider.php +++ b/app/Providers/CurrencyServiceProvider.php @@ -14,7 +14,8 @@ declare(strict_types = 1); namespace FireflyIII\Providers; -use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Repositories\Currency\CurrencyRepository; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; @@ -43,16 +44,15 @@ class CurrencyServiceProvider extends ServiceProvider public function register() { $this->app->bind( - 'FireflyIII\Repositories\Currency\CurrencyRepositoryInterface', - function (Application $app, array $arguments) { - if (!isset($arguments[0]) && $app->auth->check()) { - return app('FireflyIII\Repositories\Currency\CurrencyRepository', [auth()->user()]); - } - if (!isset($arguments[0]) && !$app->auth->check()) { - throw new FireflyException('There is no user present.'); + CurrencyRepositoryInterface::class, + function (Application $app) { + /** @var CurrencyRepository $repository */ + $repository = app(CurrencyRepository::class); + if ($app->auth->check()) { + $repository->setUser(auth()->user()); } - return app('FireflyIII\Repositories\Currency\CurrencyRepository', $arguments); + return $repository; } ); } diff --git a/app/Providers/ExportJobServiceProvider.php b/app/Providers/ExportJobServiceProvider.php index 220a678623..7c12925df1 100644 --- a/app/Providers/ExportJobServiceProvider.php +++ b/app/Providers/ExportJobServiceProvider.php @@ -15,6 +15,8 @@ declare(strict_types = 1); namespace FireflyIII\Providers; use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Repositories\ExportJob\ExportJobRepository; +use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface; use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; @@ -33,8 +35,7 @@ class ExportJobServiceProvider extends ServiceProvider */ public function boot() { - $this->exportJob(); - $this->importJob(); + } @@ -45,7 +46,8 @@ class ExportJobServiceProvider extends ServiceProvider */ public function register() { - // + $this->exportJob(); + $this->importJob(); } /** @@ -53,18 +55,16 @@ class ExportJobServiceProvider extends ServiceProvider */ private function exportJob() { - $this->app->bind( - 'FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface', - function (Application $app, array $arguments) { - if (!isset($arguments[0]) && $app->auth->check()) { - return app('FireflyIII\Repositories\ExportJob\ExportJobRepository', [auth()->user()]); - } - if (!isset($arguments[0]) && !$app->auth->check()) { - throw new FireflyException('There is no user present.'); + ExportJobRepositoryInterface::class, + function (Application $app) { + /** @var ExportJobRepository $repository */ + $repository = app(ExportJobRepository::class); + if ($app->auth->check()) { + $repository->setUser(auth()->user()); } - return app('FireflyIII\Repositories\ExportJob\ExportJobRepository', $arguments); + return $repository; } ); } From e057c4d79ccd226fb3759c34ed58e399d3c90036 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 17:29:18 +0100 Subject: [PATCH 020/276] Removed reference to crud service provider. --- config/app.php | 1 - 1 file changed, 1 deletion(-) diff --git a/config/app.php b/config/app.php index 125ec35093..1bbf9d2452 100755 --- a/config/app.php +++ b/config/app.php @@ -73,7 +73,6 @@ return [ /* * More service providers. */ - FireflyIII\Providers\CrudServiceProvider::class, FireflyIII\Providers\AccountServiceProvider::class, FireflyIII\Providers\AttachmentServiceProvider::class, FireflyIII\Providers\BillServiceProvider::class, From 615d90c8f46ac271b1fff2eb497e577caa3553ee Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 2 Feb 2017 07:35:53 +0100 Subject: [PATCH 021/276] Update various service providers. --- app/Providers/FireflyServiceProvider.php | 44 ++++++++++++++++------ app/Providers/PiggyBankServiceProvider.php | 18 ++++----- app/Providers/RuleGroupServiceProvider.php | 16 ++++---- 3 files changed, 50 insertions(+), 28 deletions(-) diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index b798f531e0..2ef97e48d2 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -13,6 +13,28 @@ declare(strict_types = 1); namespace FireflyIII\Providers; +use FireflyIII\Export\Processor; +use FireflyIII\Export\ProcessorInterface; +use FireflyIII\Generator\Chart\Basic\ChartJsGenerator; +use FireflyIII\Generator\Chart\Basic\GeneratorInterface; +use FireflyIII\Helpers\Attachments\AttachmentHelper; +use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; +use FireflyIII\Helpers\Chart\MetaPieChart; +use FireflyIII\Helpers\Chart\MetaPieChartInterface; +use FireflyIII\Helpers\FiscalHelper; +use FireflyIII\Helpers\FiscalHelperInterface; +use FireflyIII\Helpers\Help\Help; +use FireflyIII\Helpers\Help\HelpInterface; +use FireflyIII\Helpers\Report\BalanceReportHelper; +use FireflyIII\Helpers\Report\BalanceReportHelperInterface; +use FireflyIII\Helpers\Report\BudgetReportHelper; +use FireflyIII\Helpers\Report\BudgetReportHelperInterface; +use FireflyIII\Helpers\Report\ReportHelper; +use FireflyIII\Helpers\Report\ReportHelperInterface; +use FireflyIII\Import\ImportProcedure; +use FireflyIII\Import\ImportProcedureInterface; +use FireflyIII\Repositories\User\UserRepository; +use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\Support\Amount; use FireflyIII\Support\ExpandedForm; use FireflyIII\Support\FireflyConfig; @@ -94,22 +116,22 @@ class FireflyServiceProvider extends ServiceProvider ); // chart generator: - $this->app->bind('FireflyIII\Generator\Chart\Basic\GeneratorInterface', 'FireflyIII\Generator\Chart\Basic\ChartJsGenerator'); + $this->app->bind(GeneratorInterface::class, ChartJsGenerator::class); // chart builder - $this->app->bind('FireflyIII\Helpers\Chart\MetaPieChartInterface', 'FireflyIII\Helpers\Chart\MetaPieChart'); + $this->app->bind(MetaPieChartInterface::class, MetaPieChart::class); // other generators - $this->app->bind('FireflyIII\Export\ProcessorInterface', 'FireflyIII\Export\Processor'); - $this->app->bind('FireflyIII\Import\ImportProcedureInterface', 'FireflyIII\Import\ImportProcedure'); - $this->app->bind('FireflyIII\Repositories\User\UserRepositoryInterface', 'FireflyIII\Repositories\User\UserRepository'); - $this->app->bind('FireflyIII\Helpers\Attachments\AttachmentHelperInterface', 'FireflyIII\Helpers\Attachments\AttachmentHelper'); + $this->app->bind(ProcessorInterface::class,Processor::class); + $this->app->bind(ImportProcedureInterface::class,ImportProcedure::class); + $this->app->bind(UserRepositoryInterface::class, UserRepository::class); + $this->app->bind(AttachmentHelperInterface::class, AttachmentHelper::class); - $this->app->bind('FireflyIII\Helpers\Help\HelpInterface', 'FireflyIII\Helpers\Help\Help'); - $this->app->bind('FireflyIII\Helpers\Report\ReportHelperInterface', 'FireflyIII\Helpers\Report\ReportHelper'); - $this->app->bind('FireflyIII\Helpers\FiscalHelperInterface', 'FireflyIII\Helpers\FiscalHelper'); - $this->app->bind('FireflyIII\Helpers\Report\BalanceReportHelperInterface', 'FireflyIII\Helpers\Report\BalanceReportHelper'); - $this->app->bind('FireflyIII\Helpers\Report\BudgetReportHelperInterface', 'FireflyIII\Helpers\Report\BudgetReportHelper'); + $this->app->bind(HelpInterface::class, Help::class); + $this->app->bind(ReportHelperInterface::class, ReportHelper::class); + $this->app->bind(FiscalHelperInterface::class,FiscalHelper::class); + $this->app->bind(BalanceReportHelperInterface::class, BalanceReportHelper::class); + $this->app->bind(BudgetReportHelperInterface::class, BudgetReportHelper::class); } } diff --git a/app/Providers/PiggyBankServiceProvider.php b/app/Providers/PiggyBankServiceProvider.php index 11ba540e3c..fb1aaf7d5f 100644 --- a/app/Providers/PiggyBankServiceProvider.php +++ b/app/Providers/PiggyBankServiceProvider.php @@ -15,6 +15,8 @@ declare(strict_types = 1); namespace FireflyIII\Providers; use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Repositories\PiggyBank\PiggyBankRepository; +use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; @@ -44,16 +46,14 @@ class PiggyBankServiceProvider extends ServiceProvider public function register() { $this->app->bind( - 'FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface', - function (Application $app, array $arguments) { - if (!isset($arguments[0]) && $app->auth->check()) { - return app('FireflyIII\Repositories\PiggyBank\PiggyBankRepository', [auth()->user()]); + PiggyBankRepositoryInterface::class, + function (Application $app) { + /** @var PiggyBankRepository $repository */ + $repository = app(PiggyBankRepository::class); + if ($app->auth->check()) { + $repository->setUser(auth()->user()); } - if (!isset($arguments[0]) && !$app->auth->check()) { - throw new FireflyException('There is no user present.'); - } - - return app('FireflyIII\Repositories\PiggyBank\PiggyBankRepository', $arguments); + return $repository; } ); } diff --git a/app/Providers/RuleGroupServiceProvider.php b/app/Providers/RuleGroupServiceProvider.php index bddd6a8480..c6b86c1604 100644 --- a/app/Providers/RuleGroupServiceProvider.php +++ b/app/Providers/RuleGroupServiceProvider.php @@ -14,7 +14,8 @@ declare(strict_types = 1); namespace FireflyIII\Providers; -use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Repositories\RuleGroup\RuleGroupRepository; +use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; @@ -44,16 +45,15 @@ class RuleGroupServiceProvider extends ServiceProvider public function register() { $this->app->bind( - 'FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface', + RuleGroupRepositoryInterface::class, function (Application $app, array $arguments) { - if (!isset($arguments[0]) && $app->auth->check()) { - return app('FireflyIII\Repositories\RuleGroup\RuleGroupRepository', [auth()->user()]); - } - if (!isset($arguments[0]) && !$app->auth->check()) { - throw new FireflyException('There is no user present.'); + /** @var RuleGroupRepository $repository */ + $repository = app(RuleGroupRepository::class); + if ($app->auth->check()) { + $repository->setUser(auth()->user()); } - return app('FireflyIII\Repositories\RuleGroup\RuleGroupRepository', $arguments); + return $repository; } ); } From e3599c002b4fa39fd87fef29b883d88ed0121330 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 4 Feb 2017 02:19:47 +0100 Subject: [PATCH 022/276] Updated contribution instructions [skip ci] --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f7ef4c3bb3..3ebecdd310 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -8,7 +8,7 @@ If you are requesting a new feature, please check out the list of [often request ## Bugs -If you find a bug, include as many log files and details as you think are necessary. +If you find a bug, please take the time and see if the [demo site](https://firefly-iii.nder.be/) is also suffering from this bug. Include as many log files and details as you think are necessary. ## Installation problems From a7c198048e8a7aac49d7294aa25dbf7c9721fe36 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 4 Feb 2017 02:20:17 +0100 Subject: [PATCH 023/276] Add app log method. [skip ci] --- .env.example | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.example b/.env.example index 04528da7fc..eaa69b5d82 100755 --- a/.env.example +++ b/.env.example @@ -3,6 +3,7 @@ APP_DEBUG=false APP_FORCE_SSL=false APP_FORCE_ROOT= APP_KEY=SomeRandomStringOf32CharsExactly +APP_LOG=daily APP_LOG_LEVEL=warning APP_URL=http://localhost From df1da32745801c3eb773a6fd35292d218ca58813 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 4 Feb 2017 02:26:16 +0100 Subject: [PATCH 024/276] Update composer [skip ci] --- composer.json | 1 + composer.lock | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 659144ebc2..f89c9630e8 100755 --- a/composer.json +++ b/composer.json @@ -48,6 +48,7 @@ "require": { "php": ">=7.0.0", "ext-intl": "*", + "ext-bcmath": "*", "laravel/framework": "5.3.29", "davejamesmiller/laravel-breadcrumbs": "^3.0", "watson/validating": "3.*", diff --git a/composer.lock b/composer.lock index b816654cd5..26f2d42877 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "8a447ee60bb0509881af5070e5980f18", + "content-hash": "5f1001d0b797b78e769d42adf358620d", "packages": [ { "name": "bacon/bacon-qr-code", @@ -1421,16 +1421,16 @@ }, { "name": "nikic/php-parser", - "version": "v3.0.2", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "adf44419c0fc014a0f191db6f89d3e55d4211744" + "reference": "5b8182cc0abb4b0ff290ba9df6c0e1323286013a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/adf44419c0fc014a0f191db6f89d3e55d4211744", - "reference": "adf44419c0fc014a0f191db6f89d3e55d4211744", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/5b8182cc0abb4b0ff290ba9df6c0e1323286013a", + "reference": "5b8182cc0abb4b0ff290ba9df6c0e1323286013a", "shasum": "" }, "require": { @@ -1468,7 +1468,7 @@ "parser", "php" ], - "time": "2016-12-06T11:30:35+00:00" + "time": "2017-02-03T21:57:31+00:00" }, { "name": "paragonie/random_compat", @@ -4810,7 +4810,8 @@ "prefer-lowest": false, "platform": { "php": ">=7.0.0", - "ext-intl": "*" + "ext-intl": "*", + "ext-bcmath": "*" }, "platform-dev": [] } From 96b5d174d1ce8ba28ab3113e0ca20731dbd7dd5d Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 4 Feb 2017 03:04:55 +0100 Subject: [PATCH 025/276] Initial code base for Sandstorm.IO support. Very beta. --- .env.sandstorm | 55 ++ .sandstorm/.gitattributes | 5 + .sandstorm/.gitignore | 5 + .sandstorm/Vagrantfile | 103 +++ .sandstorm/build.sh | 21 + .sandstorm/global-setup.sh | 44 + .sandstorm/launcher.sh | 66 ++ .sandstorm/sandstorm-files.list | 1113 ++++++++++++++++++++++++ .sandstorm/sandstorm-pkgdef.capnp | 247 ++++++ .sandstorm/service-config/mime.types | 89 ++ .sandstorm/service-config/nginx.conf | 87 ++ .sandstorm/setup.sh | 61 ++ .sandstorm/stack | 1 + public/images/logo/firefly-iii-128.png | Bin 0 -> 14217 bytes public/images/logo/firefly-iii-150.png | Bin 0 -> 15229 bytes public/images/logo/firefly-iii-24.png | Bin 0 -> 2560 bytes public/images/logo/firefly-iii-48.png | Bin 0 -> 4823 bytes 17 files changed, 1897 insertions(+) create mode 100755 .env.sandstorm create mode 100644 .sandstorm/.gitattributes create mode 100644 .sandstorm/.gitignore create mode 100644 .sandstorm/Vagrantfile create mode 100755 .sandstorm/build.sh create mode 100755 .sandstorm/global-setup.sh create mode 100755 .sandstorm/launcher.sh create mode 100644 .sandstorm/sandstorm-files.list create mode 100644 .sandstorm/sandstorm-pkgdef.capnp create mode 100644 .sandstorm/service-config/mime.types create mode 100644 .sandstorm/service-config/nginx.conf create mode 100755 .sandstorm/setup.sh create mode 100644 .sandstorm/stack create mode 100644 public/images/logo/firefly-iii-128.png create mode 100644 public/images/logo/firefly-iii-150.png create mode 100644 public/images/logo/firefly-iii-24.png create mode 100644 public/images/logo/firefly-iii-48.png diff --git a/.env.sandstorm b/.env.sandstorm new file mode 100755 index 0000000000..ed8d9d511b --- /dev/null +++ b/.env.sandstorm @@ -0,0 +1,55 @@ +APP_ENV=production +APP_DEBUG=true +APP_FORCE_SSL=false +APP_FORCE_ROOT= +APP_KEY=SomeRandomStringOf32CharsExactly +APP_LOG=syslog +APP_LOG_LEVEL=debug +APP_URL=http://localhost + +DB_CONNECTION=mysql +DB_HOST=127.0.0.1 +DB_PORT=3306 +DB_DATABASE=firefly +DB_USERNAME=firefly +DB_PASSWORD=firefly + +BROADCAST_DRIVER=log +CACHE_DRIVER=file +SESSION_DRIVER=file +QUEUE_DRIVER=sync + +COOKIE_PATH="/" +COOKIE_DOMAIN= +COOKIE_SECURE=false + +REDIS_HOST=127.0.0.1 +REDIS_PASSWORD=null +REDIS_PORT=6379 + +MAIL_DRIVER=smtp +MAIL_HOST=mailtrap.io +MAIL_PORT=2525 +MAIL_FROM=changeme@example.com +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null + +SEND_REGISTRATION_MAIL=true +SEND_ERROR_MESSAGE=true +SHOW_INCOMPLETE_TRANSLATIONS=false + +CACHE_PREFIX=firefly + +GOOGLE_MAPS_API_KEY= +ANALYTICS_ID= +SITE_OWNER=mail@example.com +USE_ENCRYPTION=true + +PUSHER_KEY= +PUSHER_SECRET= +PUSHER_APP_ID= + +DEMO_USERNAME= +DEMO_PASSWORD= + diff --git a/.sandstorm/.gitattributes b/.sandstorm/.gitattributes new file mode 100644 index 0000000000..5a533b9f62 --- /dev/null +++ b/.sandstorm/.gitattributes @@ -0,0 +1,5 @@ + + +# vagrant-spk creates shell scripts, which must end in \n, even on a \r\n system. +*.sh text eol=lf + diff --git a/.sandstorm/.gitignore b/.sandstorm/.gitignore new file mode 100644 index 0000000000..d70e1e39e4 --- /dev/null +++ b/.sandstorm/.gitignore @@ -0,0 +1,5 @@ + + +# This file stores a list of sub-paths of .sandstorm/ that should be ignored by git. +.vagrant + diff --git a/.sandstorm/Vagrantfile b/.sandstorm/Vagrantfile new file mode 100644 index 0000000000..20c01b674b --- /dev/null +++ b/.sandstorm/Vagrantfile @@ -0,0 +1,103 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +# Guess at a reasonable name for the VM based on the folder vagrant-spk is +# run from. The timestamp is there to avoid conflicts if you have multiple +# folders with the same name. +VM_NAME = File.basename(File.dirname(File.dirname(__FILE__))) + "_sandstorm_#{Time.now.utc.to_i}" + +# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! +VAGRANTFILE_API_VERSION = "2" + +Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| + # Base on the Sandstorm snapshots of the official Debian 8 (jessie) box. + config.vm.box = "sandstorm/debian-jessie64" + + if Vagrant.has_plugin?("vagrant-vbguest") then + # vagrant-vbguest is a Vagrant plugin that upgrades + # the version of VirtualBox Guest Additions within each + # guest. If you have the vagrant-vbguest plugin, then it + # needs to know how to compile kernel modules, etc., and so + # we give it this hint about operating system type. + config.vm.guest = "debian" + end + + # We forward port 6080, the Sandstorm web port, so that developers can + # visit their sandstorm app from their browser as local.sandstorm.io:6080 + # (aka 127.0.0.1:6080). + config.vm.network :forwarded_port, guest: 6080, host: 6080 + + # Use a shell script to "provision" the box. This installs Sandstorm using + # the bundled installer. + config.vm.provision "shell", inline: "sudo bash /opt/app/.sandstorm/global-setup.sh", keep_color: true + # Then, do stack-specific and app-specific setup. + config.vm.provision "shell", inline: "sudo bash /opt/app/.sandstorm/setup.sh", keep_color: true + + # Shared folders are configured per-provider since vboxsf can't handle >4096 open files, + # NFS requires privilege escalation every time you bring a VM up, + # and 9p is only available on libvirt. + + # Calculate the number of CPUs and the amount of RAM the system has, + # in a platform-dependent way; further logic below. + cpus = nil + total_kB_ram = nil + + host = RbConfig::CONFIG['host_os'] + if host =~ /darwin/ + cpus = `sysctl -n hw.ncpu`.to_i + total_kB_ram = `sysctl -n hw.memsize`.to_i / 1024 + elsif host =~ /linux/ + cpus = `nproc`.to_i + total_kB_ram = `grep MemTotal /proc/meminfo | awk '{print $2}'`.to_i + elsif host =~ /mingw/ + # powershell may not be available on Windows XP and Vista, so wrap this in a rescue block + begin + cpus = `powershell -Command "(Get-WmiObject Win32_Processor -Property NumberOfLogicalProcessors | Select-Object -Property NumberOfLogicalProcessors | Measure-Object NumberOfLogicalProcessors -Sum).Sum"`.to_i + total_kB_ram = `powershell -Command "Get-CimInstance -class cim_physicalmemory | % $_.Capacity}"`.to_i / 1024 + rescue + end + end + # Use the same number of CPUs within Vagrant as the system, with 1 + # as a default. + # + # Use at least 512MB of RAM, and if the system has more than 2GB of + # RAM, use 1/4 of the system RAM. This seems a reasonable compromise + # between having the Vagrant guest operating system not run out of + # RAM entirely (which it basically would if we went much lower than + # 512MB) and also allowing it to use up a healthily large amount of + # RAM so it can run faster on systems that can afford it. + if cpus.nil? or cpus.zero? + cpus = 1 + end + if total_kB_ram.nil? or total_kB_ram < 2048000 + assign_ram_mb = 512 + else + assign_ram_mb = (total_kB_ram / 1024 / 4) + end + # Actually apply these CPU/memory values to the providers. + config.vm.provider :virtualbox do |vb, override| + vb.cpus = cpus + vb.memory = assign_ram_mb + vb.name = VM_NAME + vb.customize ["modifyvm", :id, "--nictype1", "Am79C973"] + + # /opt/app and /host-dot-sandstorm are used by vagrant-spk + override.vm.synced_folder "..", "/opt/app" + override.vm.synced_folder ENV["HOME"] + "/.sandstorm", "/host-dot-sandstorm" + # /vagrant is not used by vagrant-spk; we need this line so it gets disabled; if we removed the + # line, vagrant would automatically insert a synced folder in /vagrant, which is not what we want. + override.vm.synced_folder "..", "/vagrant", disabled: true + end + config.vm.provider :libvirt do |libvirt, override| + libvirt.cpus = cpus + libvirt.memory = assign_ram_mb + libvirt.default_prefix = VM_NAME + + # /opt/app and /host-dot-sandstorm are used by vagrant-spk + override.vm.synced_folder "..", "/opt/app", type: "9p", accessmode: "passthrough" + override.vm.synced_folder ENV["HOME"] + "/.sandstorm", "/host-dot-sandstorm", type: "9p", accessmode: "passthrough" + # /vagrant is not used by vagrant-spk; we need this line so it gets disabled; if we removed the + # line, vagrant would automatically insert a synced folder in /vagrant, which is not what we want. + override.vm.synced_folder "..", "/vagrant", type: "9p", accessmode: "passthrough", disabled: true + end +end diff --git a/.sandstorm/build.sh b/.sandstorm/build.sh new file mode 100755 index 0000000000..a72ac8cb24 --- /dev/null +++ b/.sandstorm/build.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# Checks if there's a composer.json, and if so, installs/runs composer. +# Only runs when we connect the app to sandstorm (so once). +set -euo pipefail + + + +cd /opt/app + +cp .env.sandstorm .env + +if [ -f /opt/app/composer.json ] ; then + if [ ! -f composer.phar ] ; then + curl -sS https://getcomposer.org/installer | php + fi + php composer.phar install --no-dev --no-suggest +fi + +# link storage folder +rm -rf /opt/app/storage +ln -s /var/storage /opt/app \ No newline at end of file diff --git a/.sandstorm/global-setup.sh b/.sandstorm/global-setup.sh new file mode 100755 index 0000000000..219c770f63 --- /dev/null +++ b/.sandstorm/global-setup.sh @@ -0,0 +1,44 @@ +#!/bin/bash +set -euo pipefail + +# Set options for curl. Since we only want to show errors from these curl commands, we also use +# 'cat' to buffer the output; for more information: +# https://github.com/sandstorm-io/vagrant-spk/issues/158 + +CURL_OPTS="--silent --show-error" +echo localhost > /etc/hostname +hostname localhost + +# The following line copies stderr through stderr to cat without accidentally leaving it in the +# output file. Be careful when changing. See: https://github.com/sandstorm-io/vagrant-spk/pull/159 +curl $CURL_OPTS https://install.sandstorm.io/ 2>&1 > /host-dot-sandstorm/caches/install.sh | cat + +SANDSTORM_CURRENT_VERSION=$(curl $CURL_OPTS -f "https://install.sandstorm.io/dev?from=0&type=install") +SANDSTORM_PACKAGE="sandstorm-$SANDSTORM_CURRENT_VERSION.tar.xz" +if [[ ! -f /host-dot-sandstorm/caches/$SANDSTORM_PACKAGE ]] ; then + echo -n "Downloading Sandstorm version ${SANDSTORM_CURRENT_VERSION}..." + curl $CURL_OPTS --output "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE.partial" "https://dl.sandstorm.io/$SANDSTORM_PACKAGE" 2>&1 | cat + mv "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE.partial" "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE" + echo "...done." +fi +if [ ! -e /opt/sandstorm/latest/sandstorm ] ; then + echo -n "Installing Sandstorm version ${SANDSTORM_CURRENT_VERSION}..." + bash /host-dot-sandstorm/caches/install.sh -d -e "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE" >/dev/null + echo "...done." +fi +modprobe ip_tables +# Make the vagrant user part of the sandstorm group so that commands like +# `spk dev` work. +usermod -a -G 'sandstorm' 'vagrant' +# Bind to all addresses, so the vagrant port-forward works. +sudo sed --in-place='' \ + --expression='s/^BIND_IP=.*/BIND_IP=0.0.0.0/' \ + /opt/sandstorm/sandstorm.conf +sudo service sandstorm restart +# Enable apt-cacher-ng proxy to make things faster if one appears to be running on the gateway IP +GATEWAY_IP=$(ip route | grep ^default | cut -d ' ' -f 3) +if nc -z "$GATEWAY_IP" 3142 ; then + echo "Acquire::http::Proxy \"http://$GATEWAY_IP:3142\";" > /etc/apt/apt.conf.d/80httpproxy +fi +# Configure apt to retry fetching things that fail to download. +echo "APT::Acquire::Retries \"10\";" > /etc/apt/apt.conf.d/80sandstorm-retry diff --git a/.sandstorm/launcher.sh b/.sandstorm/launcher.sh new file mode 100755 index 0000000000..dba084dfa2 --- /dev/null +++ b/.sandstorm/launcher.sh @@ -0,0 +1,66 @@ +#!/bin/bash + +# Runs every time we create a new grain! + +# Create a bunch of folders under the clean /var that php, nginx, and mysql expect to exist +mkdir -p /var/lib/mysql +mkdir -p /var/lib/nginx +mkdir -p /var/lib/php/sessions/ +mkdir -p /var/log +mkdir -p /var/log/mysql +mkdir -p /var/log/nginx +# Wipe /var/run, since pidfiles and socket files from previous launches should go away +# TODO someday: I'd prefer a tmpfs for these. +rm -rf /var/run +mkdir -p /var/run +rm -rf /var/tmp +mkdir -p /var/tmp +mkdir -p /var/run/mysqld + +# make storage directories +rm -rf /var/storage +mkdir -p /var/storage/app/public +mkdir -p /var/storage/build +mkdir -p /var/storage/database +mkdir -p /var/storage/debugbar +mkdir -p /var/storage/export +mkdir -p /var/storage/framework/cache +mkdir -p /var/storage/framework/sessions +mkdir -p /var/storage/framework/views +mkdir -p /var/storage/logs +mkdir -p /var/storage/upload + + +# Ensure mysql tables created +HOME=/etc/mysql /usr/bin/mysql_install_db --force + +# Spawn mysqld, php +HOME=/etc/mysql /usr/sbin/mysqld & + +/usr/sbin/php-fpm7.0 --nodaemonize --fpm-config /etc/php/7.0/fpm/php-fpm.conf & + +# Wait until mysql and php have bound their sockets, indicating readiness +while [ ! -e /var/run/mysqld/mysqld.sock ] ; do + echo "waiting for mysql to be available at /var/run/mysqld/mysqld.sock" + sleep .5 +done +while [ ! -e /var/run/php7.0-fpm.sock ] ; do + echo "waiting for php7.0-fpm to be available at /var/run/php7.0-fpm.sock" + sleep .5 +done + +echo "Installing database.." +# Install database for Firefly III +echo "CREATE DATABASE IF NOT EXISTS firefly; GRANT ALL on firefly.* TO 'firefly'@'localhost' IDENTIFIED BY 'firefly';" | mysql -uroot +echo "Done!" + +#echo "Generate key..." +#php /opt/app/artisan key:generate +#echo "Done!" + +echo "Migrating..." +php /opt/app/artisan migrate:refresh --seed --force +echo "Done!" + +# Start nginx. +/usr/sbin/nginx -c /opt/app/.sandstorm/service-config/nginx.conf -g "daemon off;" diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list new file mode 100644 index 0000000000..db769f8f6b --- /dev/null +++ b/.sandstorm/sandstorm-files.list @@ -0,0 +1,1113 @@ +# *** WARNING: GENERATED FILE *** +# This file is automatically updated and rewritten in sorted order every time +# the app runs in dev mode. You may manually add or remove files, but don't +# expect comments or ordering to be retained. +bin/bash +bin/cat +bin/chmod +bin/cp +bin/dash +bin/grep +bin/hostname +bin/ln +bin/ls +bin/mkdir +bin/rm +bin/sed +bin/sh +bin/sleep +bin/stty +etc/alternatives/php +etc/bash.bashrc +etc/bindresvport.blacklist +etc/default/nss +etc/hosts.allow +etc/hosts.deny +etc/inputrc +etc/ld.so.cache +etc/localtime +etc/mysql/conf.d +etc/mysql/conf.d/mysqld_safe_syslog.cnf +etc/mysql/conf.d/sandstorm.cnf +etc/mysql/my.cnf +etc/php/7.0/cli/conf.d +etc/php/7.0/cli/conf.d/10-mysqlnd.ini +etc/php/7.0/cli/conf.d/10-opcache.ini +etc/php/7.0/cli/conf.d/10-pdo.ini +etc/php/7.0/cli/conf.d/15-xml.ini +etc/php/7.0/cli/conf.d/20-bcmath.ini +etc/php/7.0/cli/conf.d/20-calendar.ini +etc/php/7.0/cli/conf.d/20-ctype.ini +etc/php/7.0/cli/conf.d/20-curl.ini +etc/php/7.0/cli/conf.d/20-dom.ini +etc/php/7.0/cli/conf.d/20-exif.ini +etc/php/7.0/cli/conf.d/20-fileinfo.ini +etc/php/7.0/cli/conf.d/20-ftp.ini +etc/php/7.0/cli/conf.d/20-gettext.ini +etc/php/7.0/cli/conf.d/20-iconv.ini +etc/php/7.0/cli/conf.d/20-intl.ini +etc/php/7.0/cli/conf.d/20-json.ini +etc/php/7.0/cli/conf.d/20-mbstring.ini +etc/php/7.0/cli/conf.d/20-mysqli.ini +etc/php/7.0/cli/conf.d/20-pdo_mysql.ini +etc/php/7.0/cli/conf.d/20-phar.ini +etc/php/7.0/cli/conf.d/20-posix.ini +etc/php/7.0/cli/conf.d/20-readline.ini +etc/php/7.0/cli/conf.d/20-shmop.ini +etc/php/7.0/cli/conf.d/20-simplexml.ini +etc/php/7.0/cli/conf.d/20-sockets.ini +etc/php/7.0/cli/conf.d/20-sysvmsg.ini +etc/php/7.0/cli/conf.d/20-sysvsem.ini +etc/php/7.0/cli/conf.d/20-sysvshm.ini +etc/php/7.0/cli/conf.d/20-tokenizer.ini +etc/php/7.0/cli/conf.d/20-wddx.ini +etc/php/7.0/cli/conf.d/20-xmlreader.ini +etc/php/7.0/cli/conf.d/20-xmlwriter.ini +etc/php/7.0/cli/conf.d/20-xsl.ini +etc/php/7.0/cli/php.ini +etc/php/7.0/fpm/conf.d +etc/php/7.0/fpm/conf.d/10-mysqlnd.ini +etc/php/7.0/fpm/conf.d/10-opcache.ini +etc/php/7.0/fpm/conf.d/10-pdo.ini +etc/php/7.0/fpm/conf.d/15-xml.ini +etc/php/7.0/fpm/conf.d/20-bcmath.ini +etc/php/7.0/fpm/conf.d/20-calendar.ini +etc/php/7.0/fpm/conf.d/20-ctype.ini +etc/php/7.0/fpm/conf.d/20-curl.ini +etc/php/7.0/fpm/conf.d/20-dom.ini +etc/php/7.0/fpm/conf.d/20-exif.ini +etc/php/7.0/fpm/conf.d/20-fileinfo.ini +etc/php/7.0/fpm/conf.d/20-ftp.ini +etc/php/7.0/fpm/conf.d/20-gettext.ini +etc/php/7.0/fpm/conf.d/20-iconv.ini +etc/php/7.0/fpm/conf.d/20-intl.ini +etc/php/7.0/fpm/conf.d/20-json.ini +etc/php/7.0/fpm/conf.d/20-mbstring.ini +etc/php/7.0/fpm/conf.d/20-mysqli.ini +etc/php/7.0/fpm/conf.d/20-pdo_mysql.ini +etc/php/7.0/fpm/conf.d/20-phar.ini +etc/php/7.0/fpm/conf.d/20-posix.ini +etc/php/7.0/fpm/conf.d/20-readline.ini +etc/php/7.0/fpm/conf.d/20-shmop.ini +etc/php/7.0/fpm/conf.d/20-simplexml.ini +etc/php/7.0/fpm/conf.d/20-sockets.ini +etc/php/7.0/fpm/conf.d/20-sysvmsg.ini +etc/php/7.0/fpm/conf.d/20-sysvsem.ini +etc/php/7.0/fpm/conf.d/20-sysvshm.ini +etc/php/7.0/fpm/conf.d/20-tokenizer.ini +etc/php/7.0/fpm/conf.d/20-wddx.ini +etc/php/7.0/fpm/conf.d/20-xmlreader.ini +etc/php/7.0/fpm/conf.d/20-xmlwriter.ini +etc/php/7.0/fpm/conf.d/20-xsl.ini +etc/php/7.0/fpm/php-fpm.conf +etc/php/7.0/fpm/php.ini +etc/php/7.0/fpm/pool.d +etc/php/7.0/fpm/pool.d/www.conf +etc/php/7.0/mods-available/bcmath.ini +etc/php/7.0/mods-available/calendar.ini +etc/php/7.0/mods-available/ctype.ini +etc/php/7.0/mods-available/curl.ini +etc/php/7.0/mods-available/dom.ini +etc/php/7.0/mods-available/exif.ini +etc/php/7.0/mods-available/fileinfo.ini +etc/php/7.0/mods-available/ftp.ini +etc/php/7.0/mods-available/gettext.ini +etc/php/7.0/mods-available/iconv.ini +etc/php/7.0/mods-available/intl.ini +etc/php/7.0/mods-available/json.ini +etc/php/7.0/mods-available/mbstring.ini +etc/php/7.0/mods-available/mysqli.ini +etc/php/7.0/mods-available/mysqlnd.ini +etc/php/7.0/mods-available/opcache.ini +etc/php/7.0/mods-available/pdo.ini +etc/php/7.0/mods-available/pdo_mysql.ini +etc/php/7.0/mods-available/phar.ini +etc/php/7.0/mods-available/posix.ini +etc/php/7.0/mods-available/readline.ini +etc/php/7.0/mods-available/shmop.ini +etc/php/7.0/mods-available/simplexml.ini +etc/php/7.0/mods-available/sockets.ini +etc/php/7.0/mods-available/sysvmsg.ini +etc/php/7.0/mods-available/sysvsem.ini +etc/php/7.0/mods-available/sysvshm.ini +etc/php/7.0/mods-available/tokenizer.ini +etc/php/7.0/mods-available/wddx.ini +etc/php/7.0/mods-available/xml.ini +etc/php/7.0/mods-available/xmlreader.ini +etc/php/7.0/mods-available/xmlwriter.ini +etc/php/7.0/mods-available/xsl.ini +etc/services +etc/ssl/openssl.cnf +lib/terminfo/d/dumb +lib/x86_64-linux-gnu/ld-2.19.so +lib/x86_64-linux-gnu/libacl.so.1 +lib/x86_64-linux-gnu/libacl.so.1.1.0 +lib/x86_64-linux-gnu/libaio.so.1 +lib/x86_64-linux-gnu/libaio.so.1.0.1 +lib/x86_64-linux-gnu/libattr.so.1 +lib/x86_64-linux-gnu/libattr.so.1.1.0 +lib/x86_64-linux-gnu/libaudit.so.1 +lib/x86_64-linux-gnu/libaudit.so.1.0.0 +lib/x86_64-linux-gnu/libbsd.so.0 +lib/x86_64-linux-gnu/libbsd.so.0.7.0 +lib/x86_64-linux-gnu/libbz2.so.1.0 +lib/x86_64-linux-gnu/libbz2.so.1.0.4 +lib/x86_64-linux-gnu/libc-2.19.so +lib/x86_64-linux-gnu/libc.so.6 +lib/x86_64-linux-gnu/libcom_err.so.2 +lib/x86_64-linux-gnu/libcom_err.so.2.1 +lib/x86_64-linux-gnu/libcrypt-2.19.so +lib/x86_64-linux-gnu/libcrypt.so.1 +lib/x86_64-linux-gnu/libdl-2.19.so +lib/x86_64-linux-gnu/libdl.so.2 +lib/x86_64-linux-gnu/libexpat.so.1 +lib/x86_64-linux-gnu/libexpat.so.1.6.0 +lib/x86_64-linux-gnu/libgcc_s.so.1 +lib/x86_64-linux-gnu/libgcrypt.so.20 +lib/x86_64-linux-gnu/libgcrypt.so.20.0.3 +lib/x86_64-linux-gnu/libgpg-error.so.0 +lib/x86_64-linux-gnu/libgpg-error.so.0.13.0 +lib/x86_64-linux-gnu/libjson-c.so.2 +lib/x86_64-linux-gnu/libjson-c.so.2.0.0 +lib/x86_64-linux-gnu/libkeyutils.so.1 +lib/x86_64-linux-gnu/libkeyutils.so.1.5 +lib/x86_64-linux-gnu/liblzma.so.5 +lib/x86_64-linux-gnu/liblzma.so.5.0.0 +lib/x86_64-linux-gnu/libm-2.19.so +lib/x86_64-linux-gnu/libm.so.6 +lib/x86_64-linux-gnu/libncurses.so.5 +lib/x86_64-linux-gnu/libncurses.so.5.9 +lib/x86_64-linux-gnu/libnsl-2.19.so +lib/x86_64-linux-gnu/libnsl.so.1 +lib/x86_64-linux-gnu/libnss_compat-2.19.so +lib/x86_64-linux-gnu/libnss_compat.so.2 +lib/x86_64-linux-gnu/libnss_dns-2.19.so +lib/x86_64-linux-gnu/libnss_dns.so.2 +lib/x86_64-linux-gnu/libnss_files-2.19.so +lib/x86_64-linux-gnu/libnss_files.so.2 +lib/x86_64-linux-gnu/libnss_nis-2.19.so +lib/x86_64-linux-gnu/libnss_nis.so.2 +lib/x86_64-linux-gnu/libpam.so.0 +lib/x86_64-linux-gnu/libpam.so.0.83.1 +lib/x86_64-linux-gnu/libpcre.so.3 +lib/x86_64-linux-gnu/libpcre.so.3.13.3 +lib/x86_64-linux-gnu/libpng12.so.0 +lib/x86_64-linux-gnu/libpng12.so.0.50.0 +lib/x86_64-linux-gnu/libpthread-2.19.so +lib/x86_64-linux-gnu/libpthread.so.0 +lib/x86_64-linux-gnu/libreadline.so.6 +lib/x86_64-linux-gnu/libreadline.so.6.3 +lib/x86_64-linux-gnu/libresolv-2.19.so +lib/x86_64-linux-gnu/libresolv.so.2 +lib/x86_64-linux-gnu/librt-2.19.so +lib/x86_64-linux-gnu/librt.so.1 +lib/x86_64-linux-gnu/libselinux.so.1 +lib/x86_64-linux-gnu/libsystemd.so.0 +lib/x86_64-linux-gnu/libsystemd.so.0.3.1 +lib/x86_64-linux-gnu/libtinfo.so.5 +lib/x86_64-linux-gnu/libtinfo.so.5.9 +lib/x86_64-linux-gnu/libutil-2.19.so +lib/x86_64-linux-gnu/libutil.so.1 +lib/x86_64-linux-gnu/libwrap.so.0 +lib/x86_64-linux-gnu/libwrap.so.0.7.6 +lib/x86_64-linux-gnu/libz.so.1 +lib/x86_64-linux-gnu/libz.so.1.2.8 +lib64/ld-linux-x86-64.so.2 +opt/app +opt/app/.env +opt/app/.sandstorm/launcher.sh +opt/app/.sandstorm/service-config/mime.types +opt/app/.sandstorm/service-config/nginx.conf +opt/app/app/Bootstrap/ConfigureLogging.php +opt/app/app/Console/Commands/CreateImport.php +opt/app/app/Console/Commands/EncryptFile.php +opt/app/app/Console/Commands/Import.php +opt/app/app/Console/Commands/ScanAttachments.php +opt/app/app/Console/Commands/UpgradeDatabase.php +opt/app/app/Console/Commands/UpgradeFireflyInstructions.php +opt/app/app/Console/Commands/UseEncryption.php +opt/app/app/Console/Commands/VerifyDatabase.php +opt/app/app/Console/Kernel.php +opt/app/app/Exceptions/Handler.php +opt/app/app/Http/Controllers/Controller.php +opt/app/app/Http/Controllers/HomeController.php +opt/app/app/Http/Kernel.php +opt/app/app/Http/breadcrumbs.php +opt/app/app/Jobs/Job.php +opt/app/app/Jobs/MailError.php +opt/app/app/Models/Account.php +opt/app/app/Models/AccountType.php +opt/app/app/Models/Configuration.php +opt/app/app/Models/PiggyBank.php +opt/app/app/Models/Role.php +opt/app/app/Models/TransactionCurrency.php +opt/app/app/Models/TransactionJournal.php +opt/app/app/Models/TransactionType.php +opt/app/app/Providers/AccountServiceProvider.php +opt/app/app/Providers/AppServiceProvider.php +opt/app/app/Providers/AttachmentServiceProvider.php +opt/app/app/Providers/AuthServiceProvider.php +opt/app/app/Providers/BillServiceProvider.php +opt/app/app/Providers/BudgetServiceProvider.php +opt/app/app/Providers/CategoryServiceProvider.php +opt/app/app/Providers/CrudServiceProvider.php +opt/app/app/Providers/CurrencyServiceProvider.php +opt/app/app/Providers/EventServiceProvider.php +opt/app/app/Providers/ExportJobServiceProvider.php +opt/app/app/Providers/FireflyServiceProvider.php +opt/app/app/Providers/JournalServiceProvider.php +opt/app/app/Providers/PiggyBankServiceProvider.php +opt/app/app/Providers/RouteServiceProvider.php +opt/app/app/Providers/RuleGroupServiceProvider.php +opt/app/app/Providers/RuleServiceProvider.php +opt/app/app/Providers/SearchServiceProvider.php +opt/app/app/Providers/TagServiceProvider.php +opt/app/app/Support/Facades/FireflyConfig.php +opt/app/app/Support/FireflyConfig.php +opt/app/app/Support/Models/TransactionJournalSupport.php +opt/app/app/Support/Twig/General.php +opt/app/app/Support/Twig/Journal.php +opt/app/app/Support/Twig/PiggyBank.php +opt/app/app/Support/Twig/Rule.php +opt/app/app/Support/Twig/Transaction.php +opt/app/app/Support/Twig/Translation.php +opt/app/app/Validation/FireflyValidator.php +opt/app/artisan +opt/app/bootstrap/app.php +opt/app/bootstrap/autoload.php +opt/app/bootstrap/cache/services.php +opt/app/config +opt/app/config/app.php +opt/app/config/auth.php +opt/app/config/broadcasting.php +opt/app/config/cache.php +opt/app/config/compile.php +opt/app/config/csv.php +opt/app/config/database.php +opt/app/config/filesystems.php +opt/app/config/firefly.php +opt/app/config/mail.php +opt/app/config/queue.php +opt/app/config/services.php +opt/app/config/session.php +opt/app/config/twigbridge.php +opt/app/config/upgrade.php +opt/app/config/view.php +opt/app/database/migrations +opt/app/database/migrations/2016_06_16_000000_create_support_tables.php +opt/app/database/migrations/2016_06_16_000001_create_users_table.php +opt/app/database/migrations/2016_06_16_000002_create_main_tables.php +opt/app/database/migrations/2016_08_25_091522_changes_for_3101.php +opt/app/database/migrations/2016_09_12_121359_fix_nullables.php +opt/app/database/migrations/2016_10_09_150037_expand_transactions_table.php +opt/app/database/migrations/2016_10_22_075804_changes_for_v410.php +opt/app/database/migrations/2016_11_24_210552_changes_for_v420.php +opt/app/database/migrations/2016_12_22_150431_changes_for_v430.php +opt/app/database/migrations/2016_12_28_203205_changes_for_v431.php +opt/app/database/seeds/AccountTypeSeeder.php +opt/app/database/seeds/DatabaseSeeder.php +opt/app/database/seeds/PermissionSeeder.php +opt/app/database/seeds/TransactionCurrencySeeder.php +opt/app/database/seeds/TransactionTypeSeeder.php +opt/app/public/index.php +opt/app/resources/views/emails/error-html.twig +opt/app/resources/views/emails/error-text.twig +opt/app/resources/views/emails/footer-html.twig +opt/app/resources/views/emails/footer-text.twig +opt/app/resources/views/emails/header-html.twig +opt/app/resources/views/emails/header-text.twig +opt/app/routes/api.php +opt/app/routes/console.php +opt/app/routes/web.php +opt/app/storage +opt/app/vendor/autoload.php +opt/app/vendor/composer/ClassLoader.php +opt/app/vendor/composer/autoload_real.php +opt/app/vendor/composer/autoload_static.php +opt/app/vendor/davejamesmiller/laravel-breadcrumbs/config/breadcrumbs.php +opt/app/vendor/davejamesmiller/laravel-breadcrumbs/src/CurrentRoute.php +opt/app/vendor/davejamesmiller/laravel-breadcrumbs/src/Facade.php +opt/app/vendor/davejamesmiller/laravel-breadcrumbs/src/Generator.php +opt/app/vendor/davejamesmiller/laravel-breadcrumbs/src/Manager.php +opt/app/vendor/davejamesmiller/laravel-breadcrumbs/src/ServiceProvider.php +opt/app/vendor/davejamesmiller/laravel-breadcrumbs/src/View.php +opt/app/vendor/doctrine/common/lib/Doctrine/Common/EventManager.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Configuration.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Connection.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/AbstractMySQLDriver.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/Connection.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/DriverException.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/ExceptionConverterDriver.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOConnection.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOException.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOStatement.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/ResultStatement.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/ServerInfoAwareConnection.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/Statement.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Events.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/KeywordList.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MySQLKeywords.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Query/Expression/ExpressionBuilder.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/AbstractAsset.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/Column.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/Comparator.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/Constraint.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/ForeignKeyConstraint.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/Identifier.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/Index.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/Table.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/TableDiff.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/ArrayType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/BigIntType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/BinaryType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/BlobType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/BooleanType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/DateTimeType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/DateTimeTzType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/DateType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/DecimalType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/FloatType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/GuidType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/IntegerType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/JsonArrayType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/ObjectType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/SimpleArrayType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/SmallIntType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/StringType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/TextType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/TimeType.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/Type.php +opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/VersionAwarePlatformDriver.php +opt/app/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php +opt/app/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php +opt/app/vendor/laravel/framework/src/Illuminate/Auth/Access/HandlesAuthorization.php +opt/app/vendor/laravel/framework/src/Illuminate/Auth/AuthManager.php +opt/app/vendor/laravel/framework/src/Illuminate/Auth/AuthServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Auth/Console/ClearResetsCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Auth/Console/MakeAuthCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Auth/CreatesUserProviders.php +opt/app/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Auth/GuardHelpers.php +opt/app/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordResetServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Auth/SessionGuard.php +opt/app/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Bus/BusServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Bus/Dispatcher.php +opt/app/vendor/laravel/framework/src/Illuminate/Bus/Queueable.php +opt/app/vendor/laravel/framework/src/Illuminate/Cache/CacheManager.php +opt/app/vendor/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Cache/Console/CacheTableCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Cache/Console/ClearCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Cache/Events/CacheMissed.php +opt/app/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php +opt/app/vendor/laravel/framework/src/Illuminate/Cache/Repository.php +opt/app/vendor/laravel/framework/src/Illuminate/Cache/RetrievesMultipleKeys.php +opt/app/vendor/laravel/framework/src/Illuminate/Config/Repository.php +opt/app/vendor/laravel/framework/src/Illuminate/Console/AppNamespaceDetectorTrait.php +opt/app/vendor/laravel/framework/src/Illuminate/Console/Application.php +opt/app/vendor/laravel/framework/src/Illuminate/Console/Command.php +opt/app/vendor/laravel/framework/src/Illuminate/Console/ConfirmableTrait.php +opt/app/vendor/laravel/framework/src/Illuminate/Console/Events/ArtisanStarting.php +opt/app/vendor/laravel/framework/src/Illuminate/Console/GeneratorCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Console/OutputStyle.php +opt/app/vendor/laravel/framework/src/Illuminate/Console/Parser.php +opt/app/vendor/laravel/framework/src/Illuminate/Console/ScheduleServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Schedule.php +opt/app/vendor/laravel/framework/src/Illuminate/Console/Scheduling/ScheduleRunCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Container/Container.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Access/Gate.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Factory.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Guard.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/StatefulGuard.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/SupportsBasicAuth.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/UserProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Bus/Dispatcher.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Bus/QueueingDispatcher.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Cache/Factory.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Cache/Repository.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Cache/Store.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Config/Repository.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Console/Application.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Console/Kernel.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Container/Container.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Cookie/Factory.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Cookie/QueueingFactory.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Debug/ExceptionHandler.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Encryption/Encrypter.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Events/Dispatcher.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Filesystem/FileNotFoundException.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Foundation/Application.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Hashing/Hasher.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Http/Kernel.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Logging/Log.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Mail/MailQueue.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Mail/Mailer.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Pagination/Paginator.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Pipeline/Pipeline.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/Factory.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/Job.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/Monitor.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/Queue.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/QueueableEntity.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/ShouldQueue.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Routing/Registrar.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Routing/UrlGenerator.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Routing/UrlRoutable.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Support/Arrayable.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Support/Htmlable.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Support/Jsonable.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Support/MessageBag.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Support/MessageProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Support/Renderable.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Validation/Factory.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Validation/ValidatesWhenResolved.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Validation/Validator.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/View/Factory.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/View/View.php +opt/app/vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php +opt/app/vendor/laravel/framework/src/Illuminate/Cookie/CookieServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Connection.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/ConnectionInterface.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/ConnectionResolverInterface.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Connectors/ConnectionFactory.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Connectors/Connector.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Connectors/ConnectorInterface.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Connectors/MySqlConnector.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/BaseCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/InstallCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateMakeCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RefreshCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/ResetCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RollbackCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/StatusCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/SeedCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/DatabaseManager.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/DatabaseServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/DetectsDeadlocks.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/DetectsLostConnections.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Scope.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletes.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletingScope.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Events/QueryExecuted.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Grammar.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/MigrationServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Migrations/DatabaseMigrationRepository.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Migrations/Migration.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationCreator.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationRepositoryInterface.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Migrations/Migrator.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/MySqlConnection.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/Grammar.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/MySqlGrammar.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/MySqlProcessor.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/Processor.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/QueryException.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Schema/Blueprint.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Schema/Builder.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/Grammar.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Schema/MySqlBuilder.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/SeedServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Seeder.php +opt/app/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php +opt/app/vendor/laravel/framework/src/Illuminate/Encryption/EncryptionServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Events/Dispatcher.php +opt/app/vendor/laravel/framework/src/Illuminate/Events/EventServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php +opt/app/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/AliasLoader.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Application.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/BootProviders.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/ConfigureLogging.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/HandleExceptions.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/RegisterFacades.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/RegisterProviders.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/SetRequestForConsole.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bus/DispatchesJobs.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/AppNameCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/ClearCompiledCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConfigCacheCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConfigClearCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConsoleMakeCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/DownCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/EnvironmentCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/EventGenerateCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/EventMakeCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/JobMakeCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/Kernel.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/KeyGenerateCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/ListenerMakeCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/MailMakeCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/NotificationMakeCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/OptimizeCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/PolicyMakeCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/ProviderMakeCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/RequestMakeCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteCacheCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteClearCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteListCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/ServeCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/StorageLinkCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/TestMakeCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/TinkerCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/UpCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/VendorPublishCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/ViewClearCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/EnvironmentDetector.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/Handler.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/FormRequest.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/CheckForMaintenanceMode.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/ProviderRepository.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ComposerServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ConsoleSupportServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Providers/FoundationServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/AuthServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/EventServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/RouteServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php +opt/app/vendor/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php +opt/app/vendor/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Http/Request.php +opt/app/vendor/laravel/framework/src/Illuminate/Http/Response.php +opt/app/vendor/laravel/framework/src/Illuminate/Http/ResponseTrait.php +opt/app/vendor/laravel/framework/src/Illuminate/Log/Writer.php +opt/app/vendor/laravel/framework/src/Illuminate/Mail/Events/MessageSending.php +opt/app/vendor/laravel/framework/src/Illuminate/Mail/MailServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Mail/Mailer.php +opt/app/vendor/laravel/framework/src/Illuminate/Mail/Message.php +opt/app/vendor/laravel/framework/src/Illuminate/Mail/TransportManager.php +opt/app/vendor/laravel/framework/src/Illuminate/Notifications/Console/NotificationTableCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Notifications/NotificationServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Pagination/AbstractPaginator.php +opt/app/vendor/laravel/framework/src/Illuminate/Pagination/PaginationServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Pagination/Paginator.php +opt/app/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php +opt/app/vendor/laravel/framework/src/Illuminate/Pipeline/PipelineServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/CallQueuedHandler.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/Connectors/ConnectorInterface.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/Connectors/SyncConnector.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/FailedTableCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/FlushFailedCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/ForgetFailedCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/ListFailedCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/ListenCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/RestartCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/RetryCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/TableCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/WorkCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/ConsoleServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/Events/JobProcessed.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/Events/JobProcessing.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/InteractsWithQueue.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/Jobs/Job.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/Jobs/SyncJob.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/Listener.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/Queue.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/QueueManager.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/QueueServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/SerializesAndRestoresModelIdentifiers.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/SerializesModels.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/SyncQueue.php +opt/app/vendor/laravel/framework/src/Illuminate/Queue/Worker.php +opt/app/vendor/laravel/framework/src/Illuminate/Redis/RedisServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/ControllerMakeCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/MiddlewareMakeCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/Controller.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/Events/RouteMatched.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/Matching/HostValidator.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/Matching/MethodValidator.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/Matching/SchemeValidator.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/Matching/UriValidator.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/Matching/ValidatorInterface.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/Route.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/RouteCollection.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/RouteDependencyResolverTrait.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/Router.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/RoutingServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/UrlGenerator.php +opt/app/vendor/laravel/framework/src/Illuminate/Session/Console/SessionTableCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Session/EncryptedStore.php +opt/app/vendor/laravel/framework/src/Illuminate/Session/FileSessionHandler.php +opt/app/vendor/laravel/framework/src/Illuminate/Session/SessionInterface.php +opt/app/vendor/laravel/framework/src/Illuminate/Session/SessionManager.php +opt/app/vendor/laravel/framework/src/Illuminate/Session/SessionServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Session/Store.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/AggregateServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Arr.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Collection.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Composer.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Cache.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/DB.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Event.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Facade.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Gate.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Log.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Mail.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Request.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Route.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Schema.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Validator.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/View.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Fluent.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Manager.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/MessageBag.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/NamespacedItemResolver.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Pluralizer.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/ServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Str.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Traits/Macroable.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/helpers.php +opt/app/vendor/laravel/framework/src/Illuminate/Translation/FileLoader.php +opt/app/vendor/laravel/framework/src/Illuminate/Translation/LoaderInterface.php +opt/app/vendor/laravel/framework/src/Illuminate/Translation/TranslationServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Translation/Translator.php +opt/app/vendor/laravel/framework/src/Illuminate/Validation/DatabasePresenceVerifier.php +opt/app/vendor/laravel/framework/src/Illuminate/Validation/Factory.php +opt/app/vendor/laravel/framework/src/Illuminate/Validation/PresenceVerifierInterface.php +opt/app/vendor/laravel/framework/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php +opt/app/vendor/laravel/framework/src/Illuminate/Validation/ValidationServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Validation/Validator.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/CompilerInterface.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Engines/CompilerEngine.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Engines/EngineInterface.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Engines/EngineResolver.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Engines/PhpEngine.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Factory.php +opt/app/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php +opt/app/vendor/laravel/framework/src/Illuminate/View/View.php +opt/app/vendor/laravel/framework/src/Illuminate/View/ViewFinderInterface.php +opt/app/vendor/laravel/framework/src/Illuminate/View/ViewServiceProvider.php +opt/app/vendor/laravelcollective/html/src/HtmlServiceProvider.php +opt/app/vendor/laravelcollective/html/src/helpers.php +opt/app/vendor/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php +opt/app/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php +opt/app/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php +opt/app/vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php +opt/app/vendor/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php +opt/app/vendor/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php +opt/app/vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php +opt/app/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php +opt/app/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php +opt/app/vendor/monolog/monolog/src/Monolog/Handler/SyslogHandler.php +opt/app/vendor/monolog/monolog/src/Monolog/Logger.php +opt/app/vendor/nesbot/carbon/src/Carbon/Carbon.php +opt/app/vendor/paragonie/random_compat/lib/random.php +opt/app/vendor/pragmarx/google2fa/src/Vendor/Laravel/ServiceProvider.php +opt/app/vendor/psr/log/Psr/Log/LoggerInterface.php +opt/app/vendor/psy/psysh/src/Psy/functions.php +opt/app/vendor/rcrowe/twigbridge/config/twigbridge.php +opt/app/vendor/rcrowe/twigbridge/src/Bridge.php +opt/app/vendor/rcrowe/twigbridge/src/Command/Clean.php +opt/app/vendor/rcrowe/twigbridge/src/Command/Lint.php +opt/app/vendor/rcrowe/twigbridge/src/Command/TwigBridge.php +opt/app/vendor/rcrowe/twigbridge/src/Engine/Compiler.php +opt/app/vendor/rcrowe/twigbridge/src/Engine/Twig.php +opt/app/vendor/rcrowe/twigbridge/src/Extension/Laravel/Auth.php +opt/app/vendor/rcrowe/twigbridge/src/Extension/Laravel/Config.php +opt/app/vendor/rcrowe/twigbridge/src/Extension/Laravel/Dump.php +opt/app/vendor/rcrowe/twigbridge/src/Extension/Laravel/Input.php +opt/app/vendor/rcrowe/twigbridge/src/Extension/Laravel/Session.php +opt/app/vendor/rcrowe/twigbridge/src/Extension/Laravel/Str.php +opt/app/vendor/rcrowe/twigbridge/src/Extension/Laravel/Translator.php +opt/app/vendor/rcrowe/twigbridge/src/Extension/Laravel/Url.php +opt/app/vendor/rcrowe/twigbridge/src/Extension/Loader/Facade/Caller.php +opt/app/vendor/rcrowe/twigbridge/src/Extension/Loader/Facades.php +opt/app/vendor/rcrowe/twigbridge/src/Extension/Loader/Filters.php +opt/app/vendor/rcrowe/twigbridge/src/Extension/Loader/Functions.php +opt/app/vendor/rcrowe/twigbridge/src/Extension/Loader/Loader.php +opt/app/vendor/rcrowe/twigbridge/src/Facade/Twig.php +opt/app/vendor/rcrowe/twigbridge/src/ServiceProvider.php +opt/app/vendor/rcrowe/twigbridge/src/Twig/Globals.php +opt/app/vendor/rcrowe/twigbridge/src/Twig/Loader.php +opt/app/vendor/rcrowe/twigbridge/src/Twig/Template.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/Event.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Filterable.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Grammar.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Message.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/OutputByteStream.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilter.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php +opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php +opt/app/vendor/swiftmailer/swiftmailer/lib/dependency_maps/cache_deps.php +opt/app/vendor/swiftmailer/swiftmailer/lib/dependency_maps/message_deps.php +opt/app/vendor/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php +opt/app/vendor/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php +opt/app/vendor/swiftmailer/swiftmailer/lib/mime_types.php +opt/app/vendor/swiftmailer/swiftmailer/lib/preferences.php +opt/app/vendor/swiftmailer/swiftmailer/lib/swift_init.php +opt/app/vendor/swiftmailer/swiftmailer/lib/swift_required.php +opt/app/vendor/symfony/console/Application.php +opt/app/vendor/symfony/console/Command/Command.php +opt/app/vendor/symfony/console/Command/HelpCommand.php +opt/app/vendor/symfony/console/Command/ListCommand.php +opt/app/vendor/symfony/console/Formatter/OutputFormatter.php +opt/app/vendor/symfony/console/Formatter/OutputFormatterInterface.php +opt/app/vendor/symfony/console/Formatter/OutputFormatterStyle.php +opt/app/vendor/symfony/console/Formatter/OutputFormatterStyleInterface.php +opt/app/vendor/symfony/console/Formatter/OutputFormatterStyleStack.php +opt/app/vendor/symfony/console/Helper/DebugFormatterHelper.php +opt/app/vendor/symfony/console/Helper/FormatterHelper.php +opt/app/vendor/symfony/console/Helper/Helper.php +opt/app/vendor/symfony/console/Helper/HelperInterface.php +opt/app/vendor/symfony/console/Helper/HelperSet.php +opt/app/vendor/symfony/console/Helper/ProcessHelper.php +opt/app/vendor/symfony/console/Helper/QuestionHelper.php +opt/app/vendor/symfony/console/Input/ArgvInput.php +opt/app/vendor/symfony/console/Input/ArrayInput.php +opt/app/vendor/symfony/console/Input/Input.php +opt/app/vendor/symfony/console/Input/InputArgument.php +opt/app/vendor/symfony/console/Input/InputDefinition.php +opt/app/vendor/symfony/console/Input/InputInterface.php +opt/app/vendor/symfony/console/Input/InputOption.php +opt/app/vendor/symfony/console/Output/BufferedOutput.php +opt/app/vendor/symfony/console/Output/ConsoleOutput.php +opt/app/vendor/symfony/console/Output/ConsoleOutputInterface.php +opt/app/vendor/symfony/console/Output/Output.php +opt/app/vendor/symfony/console/Output/OutputInterface.php +opt/app/vendor/symfony/console/Output/StreamOutput.php +opt/app/vendor/symfony/console/Style/OutputStyle.php +opt/app/vendor/symfony/console/Style/StyleInterface.php +opt/app/vendor/symfony/console/Style/SymfonyStyle.php +opt/app/vendor/symfony/debug/Exception/FatalErrorException.php +opt/app/vendor/symfony/debug/Exception/FlattenException.php +opt/app/vendor/symfony/debug/ExceptionHandler.php +opt/app/vendor/symfony/finder/Finder.php +opt/app/vendor/symfony/finder/Glob.php +opt/app/vendor/symfony/finder/Iterator/ExcludeDirectoryFilterIterator.php +opt/app/vendor/symfony/finder/Iterator/FileTypeFilterIterator.php +opt/app/vendor/symfony/finder/Iterator/FilenameFilterIterator.php +opt/app/vendor/symfony/finder/Iterator/FilterIterator.php +opt/app/vendor/symfony/finder/Iterator/MultiplePcreFilterIterator.php +opt/app/vendor/symfony/finder/Iterator/PathFilterIterator.php +opt/app/vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php +opt/app/vendor/symfony/finder/SplFileInfo.php +opt/app/vendor/symfony/http-foundation/FileBag.php +opt/app/vendor/symfony/http-foundation/HeaderBag.php +opt/app/vendor/symfony/http-foundation/ParameterBag.php +opt/app/vendor/symfony/http-foundation/Request.php +opt/app/vendor/symfony/http-foundation/Response.php +opt/app/vendor/symfony/http-foundation/ResponseHeaderBag.php +opt/app/vendor/symfony/http-foundation/ServerBag.php +opt/app/vendor/symfony/http-foundation/Session/SessionBagInterface.php +opt/app/vendor/symfony/http-foundation/Session/SessionInterface.php +opt/app/vendor/symfony/http-foundation/Session/Storage/MetadataBag.php +opt/app/vendor/symfony/http-kernel/HttpKernelInterface.php +opt/app/vendor/symfony/polyfill-mbstring/bootstrap.php +opt/app/vendor/symfony/polyfill-php56/bootstrap.php +opt/app/vendor/symfony/process/ExecutableFinder.php +opt/app/vendor/symfony/process/PhpExecutableFinder.php +opt/app/vendor/symfony/process/ProcessUtils.php +opt/app/vendor/symfony/routing/CompiledRoute.php +opt/app/vendor/symfony/routing/Route.php +opt/app/vendor/symfony/routing/RouteCompiler.php +opt/app/vendor/symfony/routing/RouteCompilerInterface.php +opt/app/vendor/symfony/translation/TranslatorInterface.php +opt/app/vendor/symfony/var-dumper/Cloner/AbstractCloner.php +opt/app/vendor/symfony/var-dumper/Cloner/ClonerInterface.php +opt/app/vendor/symfony/var-dumper/Cloner/VarCloner.php +opt/app/vendor/symfony/var-dumper/Resources/functions/dump.php +opt/app/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php +opt/app/vendor/twig/twig/lib/Twig/Cache/Filesystem.php +opt/app/vendor/twig/twig/lib/Twig/CacheInterface.php +opt/app/vendor/twig/twig/lib/Twig/Compiler.php +opt/app/vendor/twig/twig/lib/Twig/CompilerInterface.php +opt/app/vendor/twig/twig/lib/Twig/Environment.php +opt/app/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php +opt/app/vendor/twig/twig/lib/Twig/ExpressionParser.php +opt/app/vendor/twig/twig/lib/Twig/Extension.php +opt/app/vendor/twig/twig/lib/Twig/Extension/Core.php +opt/app/vendor/twig/twig/lib/Twig/Extension/Debug.php +opt/app/vendor/twig/twig/lib/Twig/Extension/Escaper.php +opt/app/vendor/twig/twig/lib/Twig/Extension/GlobalsInterface.php +opt/app/vendor/twig/twig/lib/Twig/Extension/Optimizer.php +opt/app/vendor/twig/twig/lib/Twig/Extension/Staging.php +opt/app/vendor/twig/twig/lib/Twig/ExtensionInterface.php +opt/app/vendor/twig/twig/lib/Twig/Lexer.php +opt/app/vendor/twig/twig/lib/Twig/LexerInterface.php +opt/app/vendor/twig/twig/lib/Twig/Loader/Array.php +opt/app/vendor/twig/twig/lib/Twig/Loader/Chain.php +opt/app/vendor/twig/twig/lib/Twig/LoaderInterface.php +opt/app/vendor/twig/twig/lib/Twig/Node.php +opt/app/vendor/twig/twig/lib/Twig/Node/Body.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Array.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Call.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Name.php +opt/app/vendor/twig/twig/lib/Twig/Node/If.php +opt/app/vendor/twig/twig/lib/Twig/Node/Include.php +opt/app/vendor/twig/twig/lib/Twig/Node/Module.php +opt/app/vendor/twig/twig/lib/Twig/Node/Print.php +opt/app/vendor/twig/twig/lib/Twig/Node/Text.php +opt/app/vendor/twig/twig/lib/Twig/NodeInterface.php +opt/app/vendor/twig/twig/lib/Twig/NodeOutputInterface.php +opt/app/vendor/twig/twig/lib/Twig/NodeTraverser.php +opt/app/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php +opt/app/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php +opt/app/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php +opt/app/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php +opt/app/vendor/twig/twig/lib/Twig/Parser.php +opt/app/vendor/twig/twig/lib/Twig/ParserInterface.php +opt/app/vendor/twig/twig/lib/Twig/SimpleFilter.php +opt/app/vendor/twig/twig/lib/Twig/SimpleFunction.php +opt/app/vendor/twig/twig/lib/Twig/SimpleTest.php +opt/app/vendor/twig/twig/lib/Twig/Source.php +opt/app/vendor/twig/twig/lib/Twig/SourceContextLoaderInterface.php +opt/app/vendor/twig/twig/lib/Twig/Template.php +opt/app/vendor/twig/twig/lib/Twig/TemplateInterface.php +opt/app/vendor/twig/twig/lib/Twig/Token.php +opt/app/vendor/twig/twig/lib/Twig/TokenParser.php +opt/app/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php +opt/app/vendor/twig/twig/lib/Twig/TokenParser/Block.php +opt/app/vendor/twig/twig/lib/Twig/TokenParser/Do.php +opt/app/vendor/twig/twig/lib/Twig/TokenParser/Embed.php +opt/app/vendor/twig/twig/lib/Twig/TokenParser/Extends.php +opt/app/vendor/twig/twig/lib/Twig/TokenParser/Filter.php +opt/app/vendor/twig/twig/lib/Twig/TokenParser/Flush.php +opt/app/vendor/twig/twig/lib/Twig/TokenParser/For.php +opt/app/vendor/twig/twig/lib/Twig/TokenParser/From.php +opt/app/vendor/twig/twig/lib/Twig/TokenParser/If.php +opt/app/vendor/twig/twig/lib/Twig/TokenParser/Import.php +opt/app/vendor/twig/twig/lib/Twig/TokenParser/Include.php +opt/app/vendor/twig/twig/lib/Twig/TokenParser/Macro.php +opt/app/vendor/twig/twig/lib/Twig/TokenParser/Set.php +opt/app/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php +opt/app/vendor/twig/twig/lib/Twig/TokenParser/Use.php +opt/app/vendor/twig/twig/lib/Twig/TokenParser/With.php +opt/app/vendor/twig/twig/lib/Twig/TokenParserBroker.php +opt/app/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php +opt/app/vendor/twig/twig/lib/Twig/TokenParserInterface.php +opt/app/vendor/twig/twig/lib/Twig/TokenStream.php +opt/app/vendor/vlucas/phpdotenv/src/Dotenv.php +opt/app/vendor/vlucas/phpdotenv/src/Loader.php +opt/app/vendor/watson/validating/src/Injectors/UniqueInjector.php +opt/app/vendor/watson/validating/src/ValidatingObserver.php +opt/app/vendor/watson/validating/src/ValidatingTrait.php +proc/cpuinfo +sandstorm-http-bridge +sandstorm-http-bridge-config +sandstorm-manifest +usr/bin/my_print_defaults +usr/bin/mysql +usr/bin/mysql_install_db +usr/bin/php +usr/bin/php7.0 +usr/bin/sudo +usr/lib/php/20151012/bcmath.so +usr/lib/php/20151012/calendar.so +usr/lib/php/20151012/ctype.so +usr/lib/php/20151012/curl.so +usr/lib/php/20151012/dom.so +usr/lib/php/20151012/exif.so +usr/lib/php/20151012/fileinfo.so +usr/lib/php/20151012/ftp.so +usr/lib/php/20151012/gettext.so +usr/lib/php/20151012/iconv.so +usr/lib/php/20151012/intl.so +usr/lib/php/20151012/json.so +usr/lib/php/20151012/mbstring.so +usr/lib/php/20151012/mysqli.so +usr/lib/php/20151012/mysqlnd.so +usr/lib/php/20151012/opcache.so +usr/lib/php/20151012/pdo.so +usr/lib/php/20151012/pdo_mysql.so +usr/lib/php/20151012/phar.so +usr/lib/php/20151012/posix.so +usr/lib/php/20151012/readline.so +usr/lib/php/20151012/shmop.so +usr/lib/php/20151012/simplexml.so +usr/lib/php/20151012/sockets.so +usr/lib/php/20151012/sysvmsg.so +usr/lib/php/20151012/sysvsem.so +usr/lib/php/20151012/sysvshm.so +usr/lib/php/20151012/tokenizer.so +usr/lib/php/20151012/wddx.so +usr/lib/php/20151012/xml.so +usr/lib/php/20151012/xmlreader.so +usr/lib/php/20151012/xmlwriter.so +usr/lib/php/20151012/xsl.so +usr/lib/ssl/openssl.cnf +usr/lib/x86_64-linux-gnu/libGeoIP.so.1 +usr/lib/x86_64-linux-gnu/libGeoIP.so.1.6.2 +usr/lib/x86_64-linux-gnu/libX11.so.6 +usr/lib/x86_64-linux-gnu/libX11.so.6.3.0 +usr/lib/x86_64-linux-gnu/libXau.so.6 +usr/lib/x86_64-linux-gnu/libXau.so.6.0.0 +usr/lib/x86_64-linux-gnu/libXdmcp.so.6 +usr/lib/x86_64-linux-gnu/libXdmcp.so.6.0.0 +usr/lib/x86_64-linux-gnu/libXpm.so.4 +usr/lib/x86_64-linux-gnu/libXpm.so.4.11.0 +usr/lib/x86_64-linux-gnu/libapparmor.so.1 +usr/lib/x86_64-linux-gnu/libapparmor.so.1.2.0 +usr/lib/x86_64-linux-gnu/libcrypto.so.1.0.0 +usr/lib/x86_64-linux-gnu/libcurl.so.4 +usr/lib/x86_64-linux-gnu/libcurl.so.4.3.0 +usr/lib/x86_64-linux-gnu/libdb-5.3.so +usr/lib/x86_64-linux-gnu/libedit.so.2 +usr/lib/x86_64-linux-gnu/libedit.so.2.0.51 +usr/lib/x86_64-linux-gnu/libexslt.so.0 +usr/lib/x86_64-linux-gnu/libexslt.so.0.8.17 +usr/lib/x86_64-linux-gnu/libffi.so.6 +usr/lib/x86_64-linux-gnu/libffi.so.6.0.2 +usr/lib/x86_64-linux-gnu/libfontconfig.so.1 +usr/lib/x86_64-linux-gnu/libfontconfig.so.1.8.0 +usr/lib/x86_64-linux-gnu/libfreetype.so.6 +usr/lib/x86_64-linux-gnu/libfreetype.so.6.11.1 +usr/lib/x86_64-linux-gnu/libgd.so.3 +usr/lib/x86_64-linux-gnu/libgd.so.3.0.0 +usr/lib/x86_64-linux-gnu/libgmp.so.10 +usr/lib/x86_64-linux-gnu/libgmp.so.10.2.0 +usr/lib/x86_64-linux-gnu/libgnutls-deb0.so.28 +usr/lib/x86_64-linux-gnu/libgnutls-deb0.so.28.41.0 +usr/lib/x86_64-linux-gnu/libgssapi_krb5.so.2 +usr/lib/x86_64-linux-gnu/libgssapi_krb5.so.2.2 +usr/lib/x86_64-linux-gnu/libhogweed.so.2 +usr/lib/x86_64-linux-gnu/libhogweed.so.2.5 +usr/lib/x86_64-linux-gnu/libicudata.so.52 +usr/lib/x86_64-linux-gnu/libicudata.so.52.1 +usr/lib/x86_64-linux-gnu/libicui18n.so.52 +usr/lib/x86_64-linux-gnu/libicui18n.so.52.1 +usr/lib/x86_64-linux-gnu/libicuio.so.52 +usr/lib/x86_64-linux-gnu/libicuio.so.52.1 +usr/lib/x86_64-linux-gnu/libicuuc.so.52 +usr/lib/x86_64-linux-gnu/libicuuc.so.52.1 +usr/lib/x86_64-linux-gnu/libidn.so.11 +usr/lib/x86_64-linux-gnu/libidn.so.11.6.12 +usr/lib/x86_64-linux-gnu/libjbig.so.0 +usr/lib/x86_64-linux-gnu/libjpeg.so.62 +usr/lib/x86_64-linux-gnu/libjpeg.so.62.1.0 +usr/lib/x86_64-linux-gnu/libk5crypto.so.3 +usr/lib/x86_64-linux-gnu/libk5crypto.so.3.1 +usr/lib/x86_64-linux-gnu/libkrb5.so.3 +usr/lib/x86_64-linux-gnu/libkrb5.so.3.3 +usr/lib/x86_64-linux-gnu/libkrb5support.so.0 +usr/lib/x86_64-linux-gnu/libkrb5support.so.0.1 +usr/lib/x86_64-linux-gnu/liblber-2.4.so.2 +usr/lib/x86_64-linux-gnu/liblber-2.4.so.2.10.3 +usr/lib/x86_64-linux-gnu/libldap_r-2.4.so.2 +usr/lib/x86_64-linux-gnu/libldap_r-2.4.so.2.10.3 +usr/lib/x86_64-linux-gnu/libmysqlclient.so.18 +usr/lib/x86_64-linux-gnu/libmysqlclient.so.18.0.0 +usr/lib/x86_64-linux-gnu/libnettle.so.4 +usr/lib/x86_64-linux-gnu/libnettle.so.4.7 +usr/lib/x86_64-linux-gnu/libossp-uuid.so.16 +usr/lib/x86_64-linux-gnu/libossp-uuid.so.16.0.22 +usr/lib/x86_64-linux-gnu/libp11-kit.so.0 +usr/lib/x86_64-linux-gnu/libp11-kit.so.0.0.0 +usr/lib/x86_64-linux-gnu/librtmp.so.1 +usr/lib/x86_64-linux-gnu/libsasl2.so.2 +usr/lib/x86_64-linux-gnu/libsasl2.so.2.0.25 +usr/lib/x86_64-linux-gnu/libssh2.so.1 +usr/lib/x86_64-linux-gnu/libssh2.so.1.0.1 +usr/lib/x86_64-linux-gnu/libssl.so.1.0.0 +usr/lib/x86_64-linux-gnu/libstdc++.so.6 +usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.20 +usr/lib/x86_64-linux-gnu/libtasn1.so.6 +usr/lib/x86_64-linux-gnu/libtasn1.so.6.3.2 +usr/lib/x86_64-linux-gnu/libtiff.so.5 +usr/lib/x86_64-linux-gnu/libtiff.so.5.2.0 +usr/lib/x86_64-linux-gnu/libvpx.so.1 +usr/lib/x86_64-linux-gnu/libvpx.so.1.3.0 +usr/lib/x86_64-linux-gnu/libxcb.so.1 +usr/lib/x86_64-linux-gnu/libxcb.so.1.1.0 +usr/lib/x86_64-linux-gnu/libxml2.so.2 +usr/lib/x86_64-linux-gnu/libxml2.so.2.9.1 +usr/lib/x86_64-linux-gnu/libxslt.so.1 +usr/lib/x86_64-linux-gnu/libxslt.so.1.1.28 +usr/sbin/mysqld +usr/sbin/nginx +usr/sbin/php-fpm7.0 +usr/share/mysql/charsets/Index.xml +usr/share/mysql/english/errmsg.sys +usr/share/mysql/fill_help_tables.sql +usr/share/mysql/mysql_system_tables.sql +usr/share/mysql/mysql_system_tables_data.sql diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp new file mode 100644 index 0000000000..2e53aaf560 --- /dev/null +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -0,0 +1,247 @@ +@0x9411e6c8b3c8a4b6; + +using Spk = import "/sandstorm/package.capnp"; +# This imports: +# $SANDSTORM_HOME/latest/usr/include/sandstorm/package.capnp +# Check out that file to see the full, documented package definition format. + +const pkgdef :Spk.PackageDefinition = ( + # The package definition. Note that the spk tool looks specifically for the + # "pkgdef" constant. + + id = "uws252ya9mep4t77tevn85333xzsgrpgth8q4y1rhknn1hammw70", + # Your app ID is actually its public key. The private key was placed in + # your keyring. All updates must be signed with the same key. + + manifest = ( + # This manifest is included in your app package to tell Sandstorm + # about your app. + + appTitle = (defaultText = "Firefly III"), + + appVersion = 0, # Increment this for every release. + + appMarketingVersion = (defaultText = "3.4.3"), + # Human-readable representation of appVersion. Should match the way you + # identify versions of your app in documentation and marketing. + + actions = [ + # Define your "new document" handlers here. + ( nounPhrase = (defaultText = "administration"), + command = .myCommand + # The command to run when starting for the first time. (".myCommand" + # is just a constant defined at the bottom of the file.) + ) + ], + + continueCommand = .myCommand, + # This is the command called to start your app back up after it has been + # shut down for inactivity. Here we're using the same command as for + # starting a new instance, but you could use different commands for each + # case. + + metadata = ( + # Data which is not needed specifically to execute the app, but is useful + # for purposes like marketing and display. These fields are documented at + # https://docs.sandstorm.io/en/latest/developing/publishing-apps/#add-required-metadata + # and (in deeper detail) in the sandstorm source code, in the Metadata section of + # https://github.com/sandstorm-io/sandstorm/blob/master/src/sandstorm/package.capnp + icons = ( + # Various icons to represent the app in various contexts. + appGrid = (png = (dpi1x = embed "public/images/logo/firefly-iii-128.png")), + grain = (png = (dpi1x = embed "public/images/logo/firefly-iii-24.png", + dpi2x = embed "public/images/logo/firefly-iii-48.png")), + market = (png = (dpi1x = embed "public/images/logo/firefly-iii-150.png")) + ), + + website = "https://firefly-iii.github.io/", + # This should be the app's main website url. + + codeUrl = "https://github.com/firefly-iii/firefly-iii", + # URL of the app's source code repository, e.g. a GitHub URL. + # Required if you specify a license requiring redistributing code, but optional otherwise. + + license = (openSource = void), + # The license this package is distributed under. See + # https://docs.sandstorm.io/en/latest/developing/publishing-apps/#license + + categories = [productivity], + # A list of categories/genres to which this app belongs, sorted with best fit first. + # See the list of categories at + # https://docs.sandstorm.io/en/latest/developing/publishing-apps/#categories + + author = ( + # Fields relating to the author of this app. + + contactEmail = "thegrumpydictator@gmail.com", + # Email address to contact for any issues with this app. This includes end-user support + # requests as well as app store administrator requests, so it is very important that this be a + # valid address with someone paying attention to it. + + #pgpSignature = embed "path/to/pgp-signature", + # PGP signature attesting responsibility for the app ID. This is a binary-format detached + # signature of the following ASCII message (not including the quotes, no newlines, and + # replacing with the standard base-32 text format of the app's ID): + # + # "I am the author of the Sandstorm.io app with the following ID: " + # + # You can create a signature file using `gpg` like so: + # + # echo -n "I am the author of the Sandstorm.io app with the following ID: " | gpg --sign > pgp-signature + # + # Further details including how to set up GPG and how to use keybase.io can be found + # at https://docs.sandstorm.io/en/latest/developing/publishing-apps/#verify-your-identity + + # upstreamAuthor = "Example App Team", + # Name of the original primary author of this app, if it is different from the person who + # produced the Sandstorm package. Setting this implies that the author connected to the PGP + # signature only "packaged" the app for Sandstorm, rather than developing the app. + # Remove this line if you consider yourself as the author of the app. + ), + + #pgpKeyring = embed "path/to/pgp-keyring", + # A keyring in GPG keyring format containing all public keys needed to verify PGP signatures in + # this manifest (as of this writing, there is only one: `author.pgpSignature`). + # + # To generate a keyring containing just your public key, do: + # + # gpg --export > keyring + # + # Where `` is a PGP key ID or email address associated with the key. + + #description = (defaultText = embed "path/to/description.md"), + # The app's description in Github-flavored Markdown format, to be displayed e.g. + # in an app store. Note that the Markdown is not permitted to contain HTML nor image tags (but + # you can include a list of screenshots separately). + + shortDescription = (defaultText = "Financial management"), + # A very short (one-to-three words) description of what the app does. For example, + # "Document editor", or "Notetaking", or "Email client". This will be displayed under the app + # title in the grid view in the app market. + + screenshots = [ + # Screenshots to use for marketing purposes. Examples below. + # Sizes are given in device-independent pixels, so if you took these + # screenshots on a Retina-style high DPI screen, divide each dimension by two. + + #(width = 746, height = 795, jpeg = embed "path/to/screenshot-1.jpeg"), + #(width = 640, height = 480, png = embed "path/to/screenshot-2.png"), + ], + #changeLog = (defaultText = embed "path/to/sandstorm-specific/changelog.md"), + # Documents the history of changes in Github-flavored markdown format (with the same restrictions + # as govern `description`). We recommend formatting this with an H1 heading for each version + # followed by a bullet list of changes. + ), + ), + + sourceMap = ( + # Here we defined where to look for files to copy into your package. The + # `spk dev` command actually figures out what files your app needs + # automatically by running it on a FUSE filesystem. So, the mappings + # here are only to tell it where to find files that the app wants. + searchPath = [ + ( sourcePath = "." ), # Search this directory first. + ( sourcePath = "/", # Then search the system root directory. + hidePaths = [ "home", "proc", "sys", + "etc/passwd", "etc/hosts", "etc/host.conf", + "etc/nsswitch.conf", "etc/resolv.conf" ] + # You probably don't want the app pulling files from these places, + # so we hide them. Note that /dev, /var, and /tmp are implicitly + # hidden because Sandstorm itself provides them. + ) + ] + ), + + fileList = "sandstorm-files.list", + # `spk dev` will write a list of all the files your app uses to this file. + # You should review it later, before shipping your app. + + alwaysInclude = [], + # Fill this list with more names of files or directories that should be + # included in your package, even if not listed in sandstorm-files.list. + # Use this to force-include stuff that you know you need but which may + # not have been detected as a dependency during `spk dev`. If you list + # a directory here, its entire contents will be included recursively. + + #bridgeConfig = ( + # # Used for integrating permissions and roles into the Sandstorm shell + # # and for sandstorm-http-bridge to pass to your app. + # # Uncomment this block and adjust the permissions and roles to make + # # sense for your app. + # # For more information, see high-level documentation at + # # https://docs.sandstorm.io/en/latest/developing/auth/ + # # and advanced details in the "BridgeConfig" section of + # # https://github.com/sandstorm-io/sandstorm/blob/master/src/sandstorm/package.capnp + # viewInfo = ( + # # For details on the viewInfo field, consult "ViewInfo" in + # # https://github.com/sandstorm-io/sandstorm/blob/master/src/sandstorm/grain.capnp + # + # permissions = [ + # # Permissions which a user may or may not possess. A user's current + # # permissions are passed to the app as a comma-separated list of `name` + # # fields in the X-Sandstorm-Permissions header with each request. + # # + # # IMPORTANT: only ever append to this list! Reordering or removing fields + # # will change behavior and permissions for existing grains! To deprecate a + # # permission, or for more information, see "PermissionDef" in + # # https://github.com/sandstorm-io/sandstorm/blob/master/src/sandstorm/grain.capnp + # ( + # name = "editor", + # # Name of the permission, used as an identifier for the permission in cases where string + # # names are preferred. Used in sandstorm-http-bridge's X-Sandstorm-Permissions HTTP header. + # + # title = (defaultText = "editor"), + # # Display name of the permission, e.g. to display in a checklist of permissions + # # that may be assigned when sharing. + # + # description = (defaultText = "grants ability to modify data"), + # # Prose describing what this role means, suitable for a tool tip or similar help text. + # ), + # ], + # roles = [ + # # Roles are logical collections of permissions. For instance, your app may have + # # a "viewer" role and an "editor" role + # ( + # title = (defaultText = "editor"), + # # Name of the role. Shown in the Sandstorm UI to indicate which users have which roles. + # + # permissions = [true], + # # An array indicating which permissions this role carries. + # # It should be the same length as the permissions array in + # # viewInfo, and the order of the lists must match. + # + # verbPhrase = (defaultText = "can make changes to the document"), + # # Brief explanatory text to show in the sharing UI indicating + # # what a user assigned this role will be able to do with the grain. + # + # description = (defaultText = "editors may view all site data and change settings."), + # # Prose describing what this role means, suitable for a tool tip or similar help text. + # ), + # ( + # title = (defaultText = "viewer"), + # permissions = [false], + # verbPhrase = (defaultText = "can view the document"), + # description = (defaultText = "viewers may view what other users have written."), + # ), + # ], + # ), + # #apiPath = "/api", + # # Apps can export an API to the world. The API is to be used primarily by Javascript + # # code and native apps, so it can't serve out regular HTML to browsers. If a request + # # comes in to your app's API, sandstorm-http-bridge will prefix the request's path with + # # this string, if specified. + #), +); + +const myCommand :Spk.Manifest.Command = ( + # Here we define the command used to start up your server. + argv = ["/sandstorm-http-bridge", "8000", "--", "/opt/app/.sandstorm/launcher.sh"], + environ = [ + # Note that this defines the *entire* environment seen by your app. + (key = "PATH", value = "/usr/local/bin:/usr/bin:/bin"), + (key = "SANDSTORM", value = "1"), + # Export SANDSTORM=1 into the environment, so that apps running within Sandstorm + # can detect if $SANDSTORM="1" at runtime, switching UI and/or backend to use + # the app's Sandstorm-specific integration code. + ] +); diff --git a/.sandstorm/service-config/mime.types b/.sandstorm/service-config/mime.types new file mode 100644 index 0000000000..89be9a4cd6 --- /dev/null +++ b/.sandstorm/service-config/mime.types @@ -0,0 +1,89 @@ + +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/png png; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + image/svg+xml svg svgz; + image/webp webp; + + application/font-woff woff; + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.wap.wmlc wmlc; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + application/vnd.openxmlformats-officedocument.wordprocessingml.document docx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx; + application/vnd.openxmlformats-officedocument.presentationml.presentation pptx; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} diff --git a/.sandstorm/service-config/nginx.conf b/.sandstorm/service-config/nginx.conf new file mode 100644 index 0000000000..b63ddaae07 --- /dev/null +++ b/.sandstorm/service-config/nginx.conf @@ -0,0 +1,87 @@ +worker_processes 4; +pid /var/run/nginx.pid; + +events { + worker_connections 768; + # multi_accept on; +} + +http { + # Basic Settings + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + # server_names_hash_bucket_size 64; + server_tokens off; + server_name_in_redirect off; + + include mime.types; + default_type application/octet-stream; + + # Logging + access_log off; + error_log stderr; + + # Prevent nginx from adding compression; this interacts badly with Sandstorm + # WebSession due to https://github.com/sandstorm-io/sandstorm/issues/289 + gzip off; + + # Trust the sandstorm-http-bridge's X-Forwarded-Proto. + map $http_x_forwarded_proto $fe_https { + default ""; + https on; + } + + server { + listen 8000 default_server; + listen [::]:8000 default_server ipv6only=on; + + # Allow arbitrarily large bodies - Sandstorm can handle them, and requests + # are authenticated already, so there's no reason for apps to add additional + # limits by default. + client_max_body_size 0; + + server_name localhost; + root /opt/app/public; + location / { + index index.php; + try_files $uri $uri/ /index.php?$query_string; + autoindex on; + sendfile off; + } + location ~ \.php$ { + try_files $uri =404; + fastcgi_pass unix:/var/run/php7.0-fpm.sock; + fastcgi_index index.php; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + + + fastcgi_param QUERY_STRING $query_string; + fastcgi_param REQUEST_METHOD $request_method; + fastcgi_param CONTENT_TYPE $content_type; + fastcgi_param CONTENT_LENGTH $content_length; + + fastcgi_param SCRIPT_NAME $fastcgi_script_name; + fastcgi_param REQUEST_URI $request_uri; + fastcgi_param DOCUMENT_URI $document_uri; + fastcgi_param DOCUMENT_ROOT $document_root; + fastcgi_param SERVER_PROTOCOL $server_protocol; + fastcgi_param HTTPS $fe_https if_not_empty; + + fastcgi_param GATEWAY_INTERFACE CGI/1.1; + fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; + + fastcgi_param REMOTE_ADDR $remote_addr; + fastcgi_param REMOTE_PORT $remote_port; + fastcgi_param SERVER_ADDR $server_addr; + fastcgi_param SERVER_PORT $server_port; + fastcgi_param SERVER_NAME $server_name; + + # PHP only, required if PHP was built with --enable-force-cgi-redirect + #fastcgi_param REDIRECT_STATUS 200; + } + } +} diff --git a/.sandstorm/setup.sh b/.sandstorm/setup.sh new file mode 100755 index 0000000000..9af16630f0 --- /dev/null +++ b/.sandstorm/setup.sh @@ -0,0 +1,61 @@ +#!/bin/bash + +# When you change this file, you must take manual action. Read this doc: +# - https://docs.sandstorm.io/en/latest/vagrant-spk/customizing/#setupsh + +set -euo pipefail + +export DEBIAN_FRONTEND=noninteractive + +# install packages so we can install apt-add-repository. +apt-get update +apt-get install -y python-software-properties software-properties-common + +# actually add repository +apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E9C74FEEA2098A6E +add-apt-repository "deb http://packages.dotdeb.org jessie all" + +# install packages. +apt-get update +apt-get install -y nginx php7.0-fpm php7.0-mysql php7.0-cli php7.0-curl git php7.0-dev php7.0-intl php7.0-dom php7.0-mbstring php7.0-bcmath mysql-server +service nginx stop +service php7.0-fpm stop +service mysql stop +systemctl disable nginx +systemctl disable php7.0-fpm +systemctl disable mysql +# patch /etc/php/7.0/fpm/pool.d/www.conf to not change uid/gid to www-data +sed --in-place='' \ + --expression='s/^listen.owner = www-data/;listen.owner = www-data/' \ + --expression='s/^listen.group = www-data/;listen.group = www-data/' \ + /etc/php/7.0/fpm/pool.d/www.conf +# patch /etc/php/7.0/fpm/php-fpm.conf to not have a pidfile +sed --in-place='' \ + --expression='s/^pid =/;pid =/' \ + /etc/php/7.0/fpm/php-fpm.conf + +# move sock file to better dir: +sed --in-place='' \ + --expression='s/^listen = \/run\/php\/php7.0-fpm.sock/listen = \/var\/run\/php7.0-fpm.sock/' \ + /etc/php/7.0/fpm/pool.d/www.conf + +# patch /etc/php/7.0/fpm/pool.d/www.conf to no clear environment variables +# so we can pass in SANDSTORM=1 to apps +sed --in-place='' \ + --expression='s/^;clear_env = no/clear_env=no/' \ + /etc/php/7.0/fpm/pool.d/www.conf +# patch mysql conf to not change uid, and to use /var/tmp over /tmp +# for secure-file-priv see https://github.com/sandstorm-io/vagrant-spk/issues/195 +sed --in-place='' \ + --expression='s/^user\t\t= mysql/#user\t\t= mysql/' \ + --expression='s,^tmpdir\t\t= /tmp,tmpdir\t\t= /var/tmp,' \ + --expression='/\[mysqld]/ a\ secure-file-priv = ""\' \ + /etc/mysql/my.cnf +# patch mysql conf to use smaller transaction logs to save disk space +cat < /etc/mysql/conf.d/sandstorm.cnf +[mysqld] +# Set the transaction log file to the minimum allowed size to save disk space. +# innodb_log_file_size = 1048576 +# Set the main data file to grow by 1MB at a time, rather than 8MB at a time. +innodb_autoextend_increment = 1 +EOF diff --git a/.sandstorm/stack b/.sandstorm/stack new file mode 100644 index 0000000000..79a9408192 --- /dev/null +++ b/.sandstorm/stack @@ -0,0 +1 @@ +lemp diff --git a/public/images/logo/firefly-iii-128.png b/public/images/logo/firefly-iii-128.png new file mode 100644 index 0000000000000000000000000000000000000000..70de2bc75ab25421558ed44142adccf5c2a6d3e0 GIT binary patch literal 14217 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�_) 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 z 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

Kxz-NWlI+ zQzU%?vy3oXRzF~{1F?oPVnKn(1hCFk(+>=4s4bOsPmn8%hv$r4!CDr7fQ{@2sm*X3 z4&n{=GT#LpP*5{y-ad0?Fgc=rULwqK&kCOOs65I{id4g};)I7FP=asTXPW7-k$c;!$MB0rNG_w4_wU6ByU33~ zHT^Y*M!UHshLO$|C>AnXApR|03=ttpTm)Zo*G5SNI4P}&Y-fqX8;|*$a+9IJaLkSz zyBqJT9BE0yPz?E8O9ef*A?@U;F@z1dtG|P|br0#_YxjfSrN^zNV)@pe&98p7_MASO z&v(9A%o>7jURuDwiV!{KkVRf;b^Rm{RXz%PxhgrGtEvf{0qwRjb!atV?}4x zzt7v{{7&*}a&qaq*9R)5Dxy&@bZced`KE8RHJbj}GX7JwmiGW8_3h8xa+%5tza5mz z2(_^3k{H_>PL$k!MouXQ%ULU~C|xS5p^?p!}TJP$-4h^_~iA znpauNTK4@Ab%ad*8tribu(@pG)TiVK{22r&1*4gU?SW=6Ulnh||DyNl9h*bcrT~?I z+vSO@do;D=`}njYw>Nj+1r%V8tYd z`|$}<>R!y8xyEGL3-Oo{aKerk+W367XZbnomfEdZQ-dl5W=zAfm$&;yym)ERwGUGh z;ZI!N+mGVh*^T3oFzSbzeAS?1Bh~l4`0!1$F_&(7Ak#D10)fWOam+yXYLxDd)c3wtL8Px2X4V52*GJZ1jl1&d|7`sTFY#NDZnuR7Ae>f9h&hjo|MWqF4XgJg zU$%jNwhpQ`+k&@a$kU4pJ_WIOp*ERP*!_YSe2P%qMhG>*wa*C^huC8SS-R7kXzn-m z-fdRb-EoAU!$qut`?ivr_XBBww}a_LaP<@98Zt{lnN+A&N3efdHP40WITz$4^TJb4 zV}$4oTaWb(bp_GC+3xl_En6EZ{G|3cql@7n<@0Nr+fwzQU`M#7w>JjID??A!5Mw>k zzQ$)@T>=#23ls+v$d7fH>(rd^LnNbXf=B*?*M%dWl9$ziAWp|ieop3vukqr!Yw_i| z56yL*ChCKd>%Cl~>I4zxrS0Holh{AZp{5@+gm)w`koHAsgm%4#*BYbXG z=V4#fX7E?KbD$-zp!|~6kw#9(_Mu;fDZ}%KBBm-jPGvm#>O1{tt{*=U_DkU{IN$`! R{`zyAq^O)om5@Qu{|Bgy$qN7g literal 0 HcmV?d00001 diff --git a/public/images/logo/firefly-iii-150.png b/public/images/logo/firefly-iii-150.png new file mode 100644 index 0000000000000000000000000000000000000000..0d97be47680667d16ca7ca1a50c67e0618189750 GIT binary patch literal 15229 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 literal 0 HcmV?d00001 diff --git a/public/images/logo/firefly-iii-24.png b/public/images/logo/firefly-iii-24.png new file mode 100644 index 0000000000000000000000000000000000000000..a727ae4992f6bdfc119bc874d7fe899361d41ead GIT binary patch literal 2560 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 PUrqWtCfW})9m4((KVD6+ literal 0 HcmV?d00001 From 5e5d4eca4b42d87d5ef138af46a75e5bdd7a8252 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 4 Feb 2017 03:22:19 +0100 Subject: [PATCH 026/276] Update some sandstorm.io files. --- .../app-graphics}/firefly-iii-128.png | Bin .../app-graphics}/firefly-iii-150.png | Bin .../app-graphics}/firefly-iii-24.png | Bin .../app-graphics}/firefly-iii-48.png | Bin .sandstorm/sandstorm-files.list | 64 ++++++++++++++++++ .sandstorm/sandstorm-pkgdef.capnp | 59 +++------------- 6 files changed, 72 insertions(+), 51 deletions(-) rename {public/images/logo => .sandstorm/app-graphics}/firefly-iii-128.png (100%) rename {public/images/logo => .sandstorm/app-graphics}/firefly-iii-150.png (100%) rename {public/images/logo => .sandstorm/app-graphics}/firefly-iii-24.png (100%) rename {public/images/logo => .sandstorm/app-graphics}/firefly-iii-48.png (100%) diff --git a/public/images/logo/firefly-iii-128.png b/.sandstorm/app-graphics/firefly-iii-128.png similarity index 100% rename from public/images/logo/firefly-iii-128.png rename to .sandstorm/app-graphics/firefly-iii-128.png diff --git a/public/images/logo/firefly-iii-150.png b/.sandstorm/app-graphics/firefly-iii-150.png similarity index 100% rename from public/images/logo/firefly-iii-150.png rename to .sandstorm/app-graphics/firefly-iii-150.png diff --git a/public/images/logo/firefly-iii-24.png b/.sandstorm/app-graphics/firefly-iii-24.png similarity index 100% rename from public/images/logo/firefly-iii-24.png rename to .sandstorm/app-graphics/firefly-iii-24.png diff --git a/public/images/logo/firefly-iii-48.png b/.sandstorm/app-graphics/firefly-iii-48.png similarity index 100% rename from public/images/logo/firefly-iii-48.png rename to .sandstorm/app-graphics/firefly-iii-48.png diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list index db769f8f6b..5f1eacded3 100644 --- a/.sandstorm/sandstorm-files.list +++ b/.sandstorm/sandstorm-files.list @@ -229,9 +229,17 @@ opt/app/app/Console/Commands/UseEncryption.php opt/app/app/Console/Commands/VerifyDatabase.php opt/app/app/Console/Kernel.php opt/app/app/Exceptions/Handler.php +opt/app/app/Http/Controllers/Auth/LoginController.php opt/app/app/Http/Controllers/Controller.php opt/app/app/Http/Controllers/HomeController.php opt/app/app/Http/Kernel.php +opt/app/app/Http/Middleware/Authenticate.php +opt/app/app/Http/Middleware/AuthenticateTwoFactor.php +opt/app/app/Http/Middleware/Binder.php +opt/app/app/Http/Middleware/EncryptCookies.php +opt/app/app/Http/Middleware/Range.php +opt/app/app/Http/Middleware/RedirectIfAuthenticated.php +opt/app/app/Http/Middleware/VerifyCsrfToken.php opt/app/app/Http/breadcrumbs.php opt/app/app/Jobs/Job.php opt/app/app/Jobs/MailError.php @@ -262,6 +270,8 @@ opt/app/app/Providers/RuleGroupServiceProvider.php opt/app/app/Providers/RuleServiceProvider.php opt/app/app/Providers/SearchServiceProvider.php opt/app/app/Providers/TagServiceProvider.php +opt/app/app/Repositories/Account/AccountRepositoryInterface.php +opt/app/app/Support/Domain.php opt/app/app/Support/Facades/FireflyConfig.php opt/app/app/Support/FireflyConfig.php opt/app/app/Support/Models/TransactionJournalSupport.php @@ -271,6 +281,7 @@ opt/app/app/Support/Twig/PiggyBank.php opt/app/app/Support/Twig/Rule.php opt/app/app/Support/Twig/Transaction.php opt/app/app/Support/Twig/Translation.php +opt/app/app/User.php opt/app/app/Validation/FireflyValidator.php opt/app/artisan opt/app/bootstrap/app.php @@ -309,13 +320,24 @@ opt/app/database/seeds/DatabaseSeeder.php opt/app/database/seeds/PermissionSeeder.php opt/app/database/seeds/TransactionCurrencySeeder.php opt/app/database/seeds/TransactionTypeSeeder.php +opt/app/public/css/firefly.css opt/app/public/index.php +opt/app/public/js/ff/guest.js +opt/app/public/js/lib/jquery-3.1.1.min.js +opt/app/public/lib/adminlte/css/AdminLTE.min.css +opt/app/public/lib/bootstrap/css/bootstrap.min.css +opt/app/public/lib/bootstrap/js/bootstrap.min.js +opt/app/public/lib/font-awesome/css/font-awesome.min.css +opt/app/resources/lang/en_US/config.php +opt/app/resources/views/auth/login.twig opt/app/resources/views/emails/error-html.twig opt/app/resources/views/emails/error-text.twig opt/app/resources/views/emails/footer-html.twig opt/app/resources/views/emails/footer-text.twig opt/app/resources/views/emails/header-html.twig opt/app/resources/views/emails/header-text.twig +opt/app/resources/views/layout/guest.twig +opt/app/resources/views/partials/favicons.twig opt/app/routes/api.php opt/app/routes/console.php opt/app/routes/web.php @@ -389,11 +411,13 @@ opt/app/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php opt/app/vendor/laravel/framework/src/Illuminate/Auth/Access/HandlesAuthorization.php opt/app/vendor/laravel/framework/src/Illuminate/Auth/AuthManager.php opt/app/vendor/laravel/framework/src/Illuminate/Auth/AuthServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Auth/Authenticatable.php opt/app/vendor/laravel/framework/src/Illuminate/Auth/Console/ClearResetsCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Auth/Console/MakeAuthCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Auth/CreatesUserProviders.php opt/app/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Auth/GuardHelpers.php +opt/app/vendor/laravel/framework/src/Illuminate/Auth/Passwords/CanResetPassword.php opt/app/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordResetServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Auth/SessionGuard.php opt/app/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastServiceProvider.php @@ -405,6 +429,8 @@ opt/app/vendor/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/Console/CacheTableCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/Console/ClearCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/Events/CacheMissed.php +opt/app/vendor/laravel/framework/src/Illuminate/Cache/Events/KeyForgotten.php +opt/app/vendor/laravel/framework/src/Illuminate/Cache/Events/KeyWritten.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/Repository.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/RetrievesMultipleKeys.php @@ -421,7 +447,10 @@ opt/app/vendor/laravel/framework/src/Illuminate/Console/ScheduleServiceProvider. opt/app/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Schedule.php opt/app/vendor/laravel/framework/src/Illuminate/Console/Scheduling/ScheduleRunCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Container/Container.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Access/Authorizable.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Access/Gate.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Authenticatable.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/CanResetPassword.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Factory.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Guard.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/StatefulGuard.php @@ -439,6 +468,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Container/Container.ph opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Cookie/Factory.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Cookie/QueueingFactory.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Debug/ExceptionHandler.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Encryption/DecryptException.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Encryption/Encrypter.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Events/Dispatcher.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Filesystem/FileNotFoundException.php @@ -454,6 +484,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/Factory.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/Job.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/Monitor.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/Queue.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/QueueableCollection.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/QueueableEntity.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/ShouldQueue.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Routing/Registrar.php @@ -472,6 +503,8 @@ opt/app/vendor/laravel/framework/src/Illuminate/Contracts/View/Factory.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/View/View.php opt/app/vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php opt/app/vendor/laravel/framework/src/Illuminate/Cookie/CookieServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/AddQueuedCookiesToResponse.php +opt/app/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Connection.php opt/app/vendor/laravel/framework/src/Illuminate/Database/ConnectionInterface.php opt/app/vendor/laravel/framework/src/Illuminate/Database/ConnectionResolverInterface.php @@ -494,6 +527,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Database/DatabaseServiceProvider opt/app/vendor/laravel/framework/src/Illuminate/Database/DetectsDeadlocks.php opt/app/vendor/laravel/framework/src/Illuminate/Database/DetectsLostConnections.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Scope.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletes.php @@ -528,7 +562,12 @@ opt/app/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php opt/app/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/AliasLoader.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Application.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Auth/Access/Authorizable.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Auth/RedirectsUsers.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ThrottlesLogins.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Auth/User.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/BootProviders.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/ConfigureLogging.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php @@ -573,6 +612,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/Handler.ph opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/FormRequest.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/CheckForMaintenanceMode.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/ProviderRepository.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ComposerServiceProvider.php @@ -585,6 +625,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesR opt/app/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php opt/app/vendor/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php opt/app/vendor/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Http/RedirectResponse.php opt/app/vendor/laravel/framework/src/Illuminate/Http/Request.php opt/app/vendor/laravel/framework/src/Illuminate/Http/Response.php opt/app/vendor/laravel/framework/src/Illuminate/Http/ResponseTrait.php @@ -595,7 +636,10 @@ opt/app/vendor/laravel/framework/src/Illuminate/Mail/Mailer.php opt/app/vendor/laravel/framework/src/Illuminate/Mail/Message.php opt/app/vendor/laravel/framework/src/Illuminate/Mail/TransportManager.php opt/app/vendor/laravel/framework/src/Illuminate/Notifications/Console/NotificationTableCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Notifications/HasDatabaseNotifications.php +opt/app/vendor/laravel/framework/src/Illuminate/Notifications/Notifiable.php opt/app/vendor/laravel/framework/src/Illuminate/Notifications/NotificationServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Notifications/RoutesNotifications.php opt/app/vendor/laravel/framework/src/Illuminate/Pagination/AbstractPaginator.php opt/app/vendor/laravel/framework/src/Illuminate/Pagination/PaginationServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Pagination/Paginator.php @@ -632,22 +676,27 @@ opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/ControllerMakeCo opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/MiddlewareMakeCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Controller.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/ControllerMiddlewareOptions.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Events/RouteMatched.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Matching/HostValidator.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Matching/MethodValidator.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Matching/SchemeValidator.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Matching/UriValidator.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Matching/ValidatorInterface.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/Middleware/SubstituteBindings.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/Redirector.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Route.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/RouteCollection.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/RouteDependencyResolverTrait.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Router.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/RoutingServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/SortedMiddleware.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/UrlGenerator.php opt/app/vendor/laravel/framework/src/Illuminate/Session/Console/SessionTableCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Session/EncryptedStore.php opt/app/vendor/laravel/framework/src/Illuminate/Session/FileSessionHandler.php +opt/app/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php opt/app/vendor/laravel/framework/src/Illuminate/Session/SessionInterface.php opt/app/vendor/laravel/framework/src/Illuminate/Session/SessionManager.php opt/app/vendor/laravel/framework/src/Illuminate/Session/SessionServiceProvider.php @@ -656,7 +705,9 @@ opt/app/vendor/laravel/framework/src/Illuminate/Support/AggregateServiceProvider opt/app/vendor/laravel/framework/src/Illuminate/Support/Arr.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Collection.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Composer.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Auth.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Cache.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Config.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/DB.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Event.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Facade.php @@ -666,6 +717,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Mail.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Request.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Route.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Schema.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/URL.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Validator.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/View.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Fluent.php @@ -676,6 +728,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Support/Pluralizer.php opt/app/vendor/laravel/framework/src/Illuminate/Support/ServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Str.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Traits/Macroable.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/ViewErrorBag.php opt/app/vendor/laravel/framework/src/Illuminate/Support/helpers.php opt/app/vendor/laravel/framework/src/Illuminate/Translation/FileLoader.php opt/app/vendor/laravel/framework/src/Illuminate/Translation/LoaderInterface.php @@ -694,6 +747,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/View/Engines/EngineResolver.php opt/app/vendor/laravel/framework/src/Illuminate/View/Engines/PhpEngine.php opt/app/vendor/laravel/framework/src/Illuminate/View/Factory.php opt/app/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromSession.php opt/app/vendor/laravel/framework/src/Illuminate/View/View.php opt/app/vendor/laravel/framework/src/Illuminate/View/ViewFinderInterface.php opt/app/vendor/laravel/framework/src/Illuminate/View/ViewServiceProvider.php @@ -868,9 +922,11 @@ opt/app/vendor/symfony/finder/Iterator/MultiplePcreFilterIterator.php opt/app/vendor/symfony/finder/Iterator/PathFilterIterator.php opt/app/vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php opt/app/vendor/symfony/finder/SplFileInfo.php +opt/app/vendor/symfony/http-foundation/Cookie.php opt/app/vendor/symfony/http-foundation/FileBag.php opt/app/vendor/symfony/http-foundation/HeaderBag.php opt/app/vendor/symfony/http-foundation/ParameterBag.php +opt/app/vendor/symfony/http-foundation/RedirectResponse.php opt/app/vendor/symfony/http-foundation/Request.php opt/app/vendor/symfony/http-foundation/Response.php opt/app/vendor/symfony/http-foundation/ResponseHeaderBag.php @@ -915,14 +971,22 @@ opt/app/vendor/twig/twig/lib/Twig/Loader/Array.php opt/app/vendor/twig/twig/lib/Twig/Loader/Chain.php opt/app/vendor/twig/twig/lib/Twig/LoaderInterface.php opt/app/vendor/twig/twig/lib/Twig/Node.php +opt/app/vendor/twig/twig/lib/Twig/Node/Block.php +opt/app/vendor/twig/twig/lib/Twig/Node/BlockReference.php opt/app/vendor/twig/twig/lib/Twig/Node/Body.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Array.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Call.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Function.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Name.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php opt/app/vendor/twig/twig/lib/Twig/Node/If.php opt/app/vendor/twig/twig/lib/Twig/Node/Include.php opt/app/vendor/twig/twig/lib/Twig/Node/Module.php diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index 2e53aaf560..5bb401c185 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -14,17 +14,9 @@ const pkgdef :Spk.PackageDefinition = ( # your keyring. All updates must be signed with the same key. manifest = ( - # This manifest is included in your app package to tell Sandstorm - # about your app. - appTitle = (defaultText = "Firefly III"), - - appVersion = 0, # Increment this for every release. - + appVersion = 0, appMarketingVersion = (defaultText = "3.4.3"), - # Human-readable representation of appVersion. Should match the way you - # identify versions of your app in documentation and marketing. - actions = [ # Define your "new document" handlers here. ( nounPhrase = (defaultText = "administration"), @@ -41,27 +33,16 @@ const pkgdef :Spk.PackageDefinition = ( # case. metadata = ( - # Data which is not needed specifically to execute the app, but is useful - # for purposes like marketing and display. These fields are documented at - # https://docs.sandstorm.io/en/latest/developing/publishing-apps/#add-required-metadata - # and (in deeper detail) in the sandstorm source code, in the Metadata section of - # https://github.com/sandstorm-io/sandstorm/blob/master/src/sandstorm/package.capnp - icons = ( - # Various icons to represent the app in various contexts. - appGrid = (png = (dpi1x = embed "public/images/logo/firefly-iii-128.png")), - grain = (png = (dpi1x = embed "public/images/logo/firefly-iii-24.png", - dpi2x = embed "public/images/logo/firefly-iii-48.png")), - market = (png = (dpi1x = embed "public/images/logo/firefly-iii-150.png")) + icons = ( + appGrid = (png = (dpi1x = embed "app-graphics/firefly-iii-128.png")), + grain = (png = (dpi1x = embed "app-graphics/firefly-iii-24.png", + dpi2x = embed "app-graphics/firefly-iii-48.png")), + market = (png = (dpi1x = embed "app-graphics/firefly-iii-150.png")) ), website = "https://firefly-iii.github.io/", - # This should be the app's main website url. - codeUrl = "https://github.com/firefly-iii/firefly-iii", - # URL of the app's source code repository, e.g. a GitHub URL. - # Required if you specify a license requiring redistributing code, but optional otherwise. - - license = (openSource = void), + license = (openSource = mit), # The license this package is distributed under. See # https://docs.sandstorm.io/en/latest/developing/publishing-apps/#license @@ -71,32 +52,8 @@ const pkgdef :Spk.PackageDefinition = ( # https://docs.sandstorm.io/en/latest/developing/publishing-apps/#categories author = ( - # Fields relating to the author of this app. - contactEmail = "thegrumpydictator@gmail.com", - # Email address to contact for any issues with this app. This includes end-user support - # requests as well as app store administrator requests, so it is very important that this be a - # valid address with someone paying attention to it. - - #pgpSignature = embed "path/to/pgp-signature", - # PGP signature attesting responsibility for the app ID. This is a binary-format detached - # signature of the following ASCII message (not including the quotes, no newlines, and - # replacing with the standard base-32 text format of the app's ID): - # - # "I am the author of the Sandstorm.io app with the following ID: " - # - # You can create a signature file using `gpg` like so: - # - # echo -n "I am the author of the Sandstorm.io app with the following ID: " | gpg --sign > pgp-signature - # - # Further details including how to set up GPG and how to use keybase.io can be found - # at https://docs.sandstorm.io/en/latest/developing/publishing-apps/#verify-your-identity - - # upstreamAuthor = "Example App Team", - # Name of the original primary author of this app, if it is different from the person who - # produced the Sandstorm package. Setting this implies that the author connected to the PGP - # signature only "packaged" the app for Sandstorm, rather than developing the app. - # Remove this line if you consider yourself as the author of the app. + upstreamAuthor = "James Cole", ), #pgpKeyring = embed "path/to/pgp-keyring", From dc348a72c8db9f9b5d50ba5c5080cac421deb531 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 4 Feb 2017 08:42:06 +0100 Subject: [PATCH 027/276] Various new scripts to improve sandstorm.io experience. --- .sandstorm/build.sh | 2 +- .sandstorm/changelog.md | 3 + .sandstorm/description.md | 3 + .sandstorm/launcher.sh | 4 - .sandstorm/pgp-keyring | Bin 0 -> 2775 bytes .sandstorm/pgp-signature | Bin 0 -> 688 bytes .sandstorm/sandstorm-files.list | 141 ++++++++++++++++++++++++++++++ .sandstorm/sandstorm-pkgdef.capnp | 38 +++----- app/Http/Kernel.php | 22 ++--- app/Http/Middleware/Sandstorm.php | 72 +++++++++++++++ 10 files changed, 240 insertions(+), 45 deletions(-) create mode 100644 .sandstorm/changelog.md create mode 100644 .sandstorm/description.md create mode 100644 .sandstorm/pgp-keyring create mode 100644 .sandstorm/pgp-signature create mode 100644 app/Http/Middleware/Sandstorm.php diff --git a/.sandstorm/build.sh b/.sandstorm/build.sh index a72ac8cb24..93daf1ba86 100755 --- a/.sandstorm/build.sh +++ b/.sandstorm/build.sh @@ -1,6 +1,6 @@ #!/bin/bash # Checks if there's a composer.json, and if so, installs/runs composer. -# Only runs when we connect the app to sandstorm (so once). +# This script only runs once, when the app connects to sandstorm. set -euo pipefail diff --git a/.sandstorm/changelog.md b/.sandstorm/changelog.md new file mode 100644 index 0000000000..58249de976 --- /dev/null +++ b/.sandstorm/changelog.md @@ -0,0 +1,3 @@ +# 3.4.3 + +* Initial release on Sandstorm.io \ No newline at end of file diff --git a/.sandstorm/description.md b/.sandstorm/description.md new file mode 100644 index 0000000000..e9f6874f3f --- /dev/null +++ b/.sandstorm/description.md @@ -0,0 +1,3 @@ +"Firefly III" is a financial manager. It can help you keep track of expenses, income, budgets and everything in between. It even supports credit cards, shared household accounts and savings accounts! It’s pretty fancy. You should use it to save and organise money. + +Firefly works on the principle that if you know where you’re money is going, you can stop it from going there. \ No newline at end of file diff --git a/.sandstorm/launcher.sh b/.sandstorm/launcher.sh index dba084dfa2..790f4e9711 100755 --- a/.sandstorm/launcher.sh +++ b/.sandstorm/launcher.sh @@ -54,10 +54,6 @@ echo "Installing database.." echo "CREATE DATABASE IF NOT EXISTS firefly; GRANT ALL on firefly.* TO 'firefly'@'localhost' IDENTIFIED BY 'firefly';" | mysql -uroot echo "Done!" -#echo "Generate key..." -#php /opt/app/artisan key:generate -#echo "Done!" - echo "Migrating..." php /opt/app/artisan migrate:refresh --seed --force echo "Done!" diff --git a/.sandstorm/pgp-keyring b/.sandstorm/pgp-keyring new file mode 100644 index 0000000000000000000000000000000000000000..b0dec3c169ac06a141e53541dd72b2819535ed20 GIT binary patch literal 2775 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 literal 0 HcmV?d00001 diff --git a/.sandstorm/pgp-signature b/.sandstorm/pgp-signature new file mode 100644 index 0000000000000000000000000000000000000000..82e5fc8a52cd88aa1fa315cd9492a83a0966c0e7 GIT binary patch literal 688 zcmV;h0#E&;0RgE3R{f9-0{{vE!D(UURp(1y0n2$}09ciTf=M7@Z6I`LWgua7bZBpK zAa7MmANklpzb$4?z zH8Oc&Ic;TdG;}vNbY*sKI5jgfGkAJ)XL4|7bZ9tnGCYwWkNumO%Vf9eT%Wi>WfXH5FkNXS; zD7F~l1TS%S<8I5LKAQZ;^(RI=H#c|=vco>Ae+X-SaWO&7)A|UxSUe%Mp<9(~QQ2Q- zvGKz`9^?9^dJDhJAR=266y+E;5($FhfP63bq~HWuU+8A#9;gYFB6^iIvv)%DyL18w=!MTeGdCHLTqrrzY2m>Gq8NM+e7z<|CRF-bnxl-KiloD(q4? z|BYisaz?>WKvdxfx|KBu7I^C04#H%>-PLbI&fqn@%zziph)3IU W?~QZ|VG=>*yb+B=oyMWlv3N`v@H)Z( literal 0 HcmV?d00001 diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list index 5f1eacded3..7d8d51d516 100644 --- a/.sandstorm/sandstorm-files.list +++ b/.sandstorm/sandstorm-files.list @@ -25,6 +25,7 @@ etc/hosts.allow etc/hosts.deny etc/inputrc etc/ld.so.cache +etc/locale.alias etc/localtime etc/mysql/conf.d etc/mysql/conf.d/mysqld_safe_syslog.cnf @@ -229,9 +230,21 @@ opt/app/app/Console/Commands/UseEncryption.php opt/app/app/Console/Commands/VerifyDatabase.php opt/app/app/Console/Kernel.php opt/app/app/Exceptions/Handler.php +opt/app/app/Generator/Chart/Basic/ChartJsGenerator.php +opt/app/app/Generator/Chart/Basic/GeneratorInterface.php +opt/app/app/Helpers/Collector/JournalCollector.php +opt/app/app/Helpers/Collector/JournalCollectorInterface.php opt/app/app/Http/Controllers/Auth/LoginController.php +opt/app/app/Http/Controllers/BudgetController.php +opt/app/app/Http/Controllers/Chart/AccountController.php +opt/app/app/Http/Controllers/Chart/BudgetController.php +opt/app/app/Http/Controllers/Chart/CategoryController.php opt/app/app/Http/Controllers/Controller.php opt/app/app/Http/Controllers/HomeController.php +opt/app/app/Http/Controllers/JavascriptController.php +opt/app/app/Http/Controllers/JsonController.php +opt/app/app/Http/Controllers/NewUserController.php +opt/app/app/Http/Controllers/ProfileController.php opt/app/app/Http/Kernel.php opt/app/app/Http/Middleware/Authenticate.php opt/app/app/Http/Middleware/AuthenticateTwoFactor.php @@ -239,15 +252,27 @@ opt/app/app/Http/Middleware/Binder.php opt/app/app/Http/Middleware/EncryptCookies.php opt/app/app/Http/Middleware/Range.php opt/app/app/Http/Middleware/RedirectIfAuthenticated.php +opt/app/app/Http/Middleware/Sandstorm.php opt/app/app/Http/Middleware/VerifyCsrfToken.php +opt/app/app/Http/Requests/NewUserFormRequest.php +opt/app/app/Http/Requests/Request.php opt/app/app/Http/breadcrumbs.php opt/app/app/Jobs/Job.php opt/app/app/Jobs/MailError.php opt/app/app/Models/Account.php +opt/app/app/Models/AccountMeta.php opt/app/app/Models/AccountType.php +opt/app/app/Models/AvailableBudget.php +opt/app/app/Models/Bill.php +opt/app/app/Models/Budget.php +opt/app/app/Models/BudgetLimit.php +opt/app/app/Models/Category.php opt/app/app/Models/Configuration.php opt/app/app/Models/PiggyBank.php +opt/app/app/Models/Preference.php opt/app/app/Models/Role.php +opt/app/app/Models/Tag.php +opt/app/app/Models/Transaction.php opt/app/app/Models/TransactionCurrency.php opt/app/app/Models/TransactionJournal.php opt/app/app/Models/TransactionType.php @@ -270,11 +295,34 @@ opt/app/app/Providers/RuleGroupServiceProvider.php opt/app/app/Providers/RuleServiceProvider.php opt/app/app/Providers/SearchServiceProvider.php opt/app/app/Providers/TagServiceProvider.php +opt/app/app/Repositories/Account/AccountRepository.php opt/app/app/Repositories/Account/AccountRepositoryInterface.php +opt/app/app/Repositories/Account/AccountTasker.php +opt/app/app/Repositories/Account/AccountTaskerInterface.php +opt/app/app/Repositories/Bill/BillRepository.php +opt/app/app/Repositories/Bill/BillRepositoryInterface.php +opt/app/app/Repositories/Budget/BudgetRepository.php +opt/app/app/Repositories/Budget/BudgetRepositoryInterface.php +opt/app/app/Repositories/Category/CategoryRepository.php +opt/app/app/Repositories/Category/CategoryRepositoryInterface.php +opt/app/app/Repositories/Journal/JournalRepository.php +opt/app/app/Repositories/Journal/JournalRepositoryInterface.php +opt/app/app/Support/Amount.php +opt/app/app/Support/CacheProperties.php opt/app/app/Support/Domain.php +opt/app/app/Support/ExpandedForm.php +opt/app/app/Support/Facades/Amount.php +opt/app/app/Support/Facades/ExpandedForm.php opt/app/app/Support/Facades/FireflyConfig.php +opt/app/app/Support/Facades/Navigation.php +opt/app/app/Support/Facades/Preferences.php +opt/app/app/Support/Facades/Steam.php opt/app/app/Support/FireflyConfig.php +opt/app/app/Support/Models/TagSupport.php opt/app/app/Support/Models/TransactionJournalSupport.php +opt/app/app/Support/Navigation.php +opt/app/app/Support/Preferences.php +opt/app/app/Support/Steam.php opt/app/app/Support/Twig/General.php opt/app/app/Support/Twig/Journal.php opt/app/app/Support/Twig/PiggyBank.php @@ -320,24 +368,62 @@ opt/app/database/seeds/DatabaseSeeder.php opt/app/database/seeds/PermissionSeeder.php opt/app/database/seeds/TransactionCurrencySeeder.php opt/app/database/seeds/TransactionTypeSeeder.php +opt/app/public/css/bootstrap-tour.min.css +opt/app/public/css/daterangepicker.css opt/app/public/css/firefly.css opt/app/public/index.php +opt/app/public/js/ff/budgets/index.js +opt/app/public/js/ff/charts.defaults.js +opt/app/public/js/ff/charts.js +opt/app/public/js/ff/firefly.js opt/app/public/js/ff/guest.js +opt/app/public/js/ff/help.js +opt/app/public/js/ff/index.js +opt/app/public/js/lib/Chart.bundle.min.js +opt/app/public/js/lib/accounting.min.js +opt/app/public/js/lib/bootstrap-tour.min.js +opt/app/public/js/lib/daterangepicker.js opt/app/public/js/lib/jquery-3.1.1.min.js +opt/app/public/js/lib/moment.min.js opt/app/public/lib/adminlte/css/AdminLTE.min.css +opt/app/public/lib/adminlte/css/skins/skin-blue-light.min.css +opt/app/public/lib/adminlte/js/app.min.js opt/app/public/lib/bootstrap/css/bootstrap.min.css opt/app/public/lib/bootstrap/js/bootstrap.min.js opt/app/public/lib/font-awesome/css/font-awesome.min.css +opt/app/public/lib/font-awesome/fonts/fontawesome-webfont.woff2 +opt/app/resources/lang/en_US/breadcrumbs.php opt/app/resources/lang/en_US/config.php +opt/app/resources/lang/en_US/firefly.php +opt/app/resources/lang/en_US/form.php +opt/app/resources/lang/en_US/help.php +opt/app/resources/lang/en_US/validation.php opt/app/resources/views/auth/login.twig +opt/app/resources/views/budgets/index.twig opt/app/resources/views/emails/error-html.twig opt/app/resources/views/emails/error-text.twig opt/app/resources/views/emails/footer-html.twig opt/app/resources/views/emails/footer-text.twig opt/app/resources/views/emails/header-html.twig opt/app/resources/views/emails/header-text.twig +opt/app/resources/views/form/balance.twig +opt/app/resources/views/form/feedback.twig +opt/app/resources/views/form/help.twig +opt/app/resources/views/form/text.twig +opt/app/resources/views/index.twig +opt/app/resources/views/javascript/variables.twig +opt/app/resources/views/json/tour.twig +opt/app/resources/views/layout/default.twig opt/app/resources/views/layout/guest.twig +opt/app/resources/views/list/journals-tiny-tasker.twig +opt/app/resources/views/new-user/index.twig +opt/app/resources/views/partials/boxes.twig +opt/app/resources/views/partials/control-bar.twig opt/app/resources/views/partials/favicons.twig +opt/app/resources/views/partials/flashes.twig +opt/app/resources/views/partials/menu-sidebar.twig +opt/app/resources/views/partials/page-header.twig +opt/app/resources/views/profile/index.twig opt/app/routes/api.php opt/app/routes/console.php opt/app/routes/web.php @@ -353,6 +439,7 @@ opt/app/vendor/davejamesmiller/laravel-breadcrumbs/src/Generator.php opt/app/vendor/davejamesmiller/laravel-breadcrumbs/src/Manager.php opt/app/vendor/davejamesmiller/laravel-breadcrumbs/src/ServiceProvider.php opt/app/vendor/davejamesmiller/laravel-breadcrumbs/src/View.php +opt/app/vendor/davejamesmiller/laravel-breadcrumbs/views/bootstrap3.blade.php opt/app/vendor/doctrine/common/lib/Doctrine/Common/EventManager.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Configuration.php opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Connection.php @@ -416,6 +503,8 @@ opt/app/vendor/laravel/framework/src/Illuminate/Auth/Console/ClearResetsCommand. opt/app/vendor/laravel/framework/src/Illuminate/Auth/Console/MakeAuthCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Auth/CreatesUserProviders.php opt/app/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Auth/Events/Authenticated.php +opt/app/vendor/laravel/framework/src/Illuminate/Auth/Events/Login.php opt/app/vendor/laravel/framework/src/Illuminate/Auth/GuardHelpers.php opt/app/vendor/laravel/framework/src/Illuminate/Auth/Passwords/CanResetPassword.php opt/app/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordResetServiceProvider.php @@ -428,6 +517,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Cache/CacheManager.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/Console/CacheTableCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/Console/ClearCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Cache/Events/CacheHit.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/Events/CacheMissed.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/Events/KeyForgotten.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/Events/KeyWritten.php @@ -488,6 +578,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/QueueableCollect opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/QueueableEntity.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/ShouldQueue.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Routing/Registrar.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Routing/ResponseFactory.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Routing/UrlGenerator.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Routing/UrlRoutable.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Support/Arrayable.php @@ -529,6 +620,11 @@ opt/app/vendor/laravel/framework/src/Illuminate/Database/DetectsLostConnections. opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasMany.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Relation.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Scope.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletes.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletingScope.php @@ -542,8 +638,10 @@ opt/app/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationRep opt/app/vendor/laravel/framework/src/Illuminate/Database/Migrations/Migrator.php opt/app/vendor/laravel/framework/src/Illuminate/Database/MySqlConnection.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/Expression.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/Grammar.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/MySqlGrammar.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/JoinClause.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/MySqlProcessor.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/Processor.php opt/app/vendor/laravel/framework/src/Illuminate/Database/QueryException.php @@ -625,6 +723,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesR opt/app/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php opt/app/vendor/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php opt/app/vendor/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Http/JsonResponse.php opt/app/vendor/laravel/framework/src/Illuminate/Http/RedirectResponse.php opt/app/vendor/laravel/framework/src/Illuminate/Http/Request.php opt/app/vendor/laravel/framework/src/Illuminate/Http/Response.php @@ -686,6 +785,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Routing/Matching/ValidatorInterf opt/app/vendor/laravel/framework/src/Illuminate/Routing/Middleware/SubstituteBindings.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Redirector.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/ResponseFactory.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Route.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/RouteCollection.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/RouteDependencyResolverTrait.php @@ -701,26 +801,33 @@ opt/app/vendor/laravel/framework/src/Illuminate/Session/SessionInterface.php opt/app/vendor/laravel/framework/src/Illuminate/Session/SessionManager.php opt/app/vendor/laravel/framework/src/Illuminate/Session/SessionServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Session/Store.php +opt/app/vendor/laravel/framework/src/Illuminate/Session/TokenMismatchException.php opt/app/vendor/laravel/framework/src/Illuminate/Support/AggregateServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Arr.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Collection.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Composer.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/App.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Auth.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Cache.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Config.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Crypt.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/DB.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Event.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Facade.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Gate.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Input.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Log.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Mail.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Request.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Response.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Route.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Schema.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Session.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/URL.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Validator.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/View.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Fluent.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/HtmlString.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Manager.php opt/app/vendor/laravel/framework/src/Illuminate/Support/MessageBag.php opt/app/vendor/laravel/framework/src/Illuminate/Support/NamespacedItemResolver.php @@ -738,8 +845,11 @@ opt/app/vendor/laravel/framework/src/Illuminate/Validation/DatabasePresenceVerif opt/app/vendor/laravel/framework/src/Illuminate/Validation/Factory.php opt/app/vendor/laravel/framework/src/Illuminate/Validation/PresenceVerifierInterface.php opt/app/vendor/laravel/framework/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php +opt/app/vendor/laravel/framework/src/Illuminate/Validation/ValidationException.php opt/app/vendor/laravel/framework/src/Illuminate/Validation/ValidationServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Validation/Validator.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/BladeCompiler.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Compiler.php opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/CompilerInterface.php opt/app/vendor/laravel/framework/src/Illuminate/View/Engines/CompilerEngine.php opt/app/vendor/laravel/framework/src/Illuminate/View/Engines/EngineInterface.php @@ -751,6 +861,10 @@ opt/app/vendor/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromS opt/app/vendor/laravel/framework/src/Illuminate/View/View.php opt/app/vendor/laravel/framework/src/Illuminate/View/ViewFinderInterface.php opt/app/vendor/laravel/framework/src/Illuminate/View/ViewServiceProvider.php +opt/app/vendor/laravelcollective/html/src/Componentable.php +opt/app/vendor/laravelcollective/html/src/FormBuilder.php +opt/app/vendor/laravelcollective/html/src/FormFacade.php +opt/app/vendor/laravelcollective/html/src/HtmlBuilder.php opt/app/vendor/laravelcollective/html/src/HtmlServiceProvider.php opt/app/vendor/laravelcollective/html/src/helpers.php opt/app/vendor/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php @@ -765,6 +879,7 @@ opt/app/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php opt/app/vendor/monolog/monolog/src/Monolog/Handler/SyslogHandler.php opt/app/vendor/monolog/monolog/src/Monolog/Logger.php opt/app/vendor/nesbot/carbon/src/Carbon/Carbon.php +opt/app/vendor/nesbot/carbon/src/Carbon/Lang/en.php opt/app/vendor/paragonie/random_compat/lib/random.php opt/app/vendor/pragmarx/google2fa/src/Vendor/Laravel/ServiceProvider.php opt/app/vendor/psr/log/Psr/Log/LoggerInterface.php @@ -912,8 +1027,11 @@ opt/app/vendor/symfony/console/Style/SymfonyStyle.php opt/app/vendor/symfony/debug/Exception/FatalErrorException.php opt/app/vendor/symfony/debug/Exception/FlattenException.php opt/app/vendor/symfony/debug/ExceptionHandler.php +opt/app/vendor/symfony/finder/Comparator/Comparator.php +opt/app/vendor/symfony/finder/Comparator/DateComparator.php opt/app/vendor/symfony/finder/Finder.php opt/app/vendor/symfony/finder/Glob.php +opt/app/vendor/symfony/finder/Iterator/DateRangeFilterIterator.php opt/app/vendor/symfony/finder/Iterator/ExcludeDirectoryFilterIterator.php opt/app/vendor/symfony/finder/Iterator/FileTypeFilterIterator.php opt/app/vendor/symfony/finder/Iterator/FilenameFilterIterator.php @@ -922,9 +1040,12 @@ opt/app/vendor/symfony/finder/Iterator/MultiplePcreFilterIterator.php opt/app/vendor/symfony/finder/Iterator/PathFilterIterator.php opt/app/vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php opt/app/vendor/symfony/finder/SplFileInfo.php +opt/app/vendor/symfony/http-foundation/AcceptHeader.php +opt/app/vendor/symfony/http-foundation/AcceptHeaderItem.php opt/app/vendor/symfony/http-foundation/Cookie.php opt/app/vendor/symfony/http-foundation/FileBag.php opt/app/vendor/symfony/http-foundation/HeaderBag.php +opt/app/vendor/symfony/http-foundation/JsonResponse.php opt/app/vendor/symfony/http-foundation/ParameterBag.php opt/app/vendor/symfony/http-foundation/RedirectResponse.php opt/app/vendor/symfony/http-foundation/Request.php @@ -944,6 +1065,11 @@ opt/app/vendor/symfony/routing/CompiledRoute.php opt/app/vendor/symfony/routing/Route.php opt/app/vendor/symfony/routing/RouteCompiler.php opt/app/vendor/symfony/routing/RouteCompilerInterface.php +opt/app/vendor/symfony/translation/Loader/ArrayLoader.php +opt/app/vendor/symfony/translation/Loader/LoaderInterface.php +opt/app/vendor/symfony/translation/MessageSelector.php +opt/app/vendor/symfony/translation/Translator.php +opt/app/vendor/symfony/translation/TranslatorBagInterface.php opt/app/vendor/symfony/translation/TranslatorInterface.php opt/app/vendor/symfony/var-dumper/Cloner/AbstractCloner.php opt/app/vendor/symfony/var-dumper/Cloner/ClonerInterface.php @@ -970,14 +1096,21 @@ opt/app/vendor/twig/twig/lib/Twig/LexerInterface.php opt/app/vendor/twig/twig/lib/Twig/Loader/Array.php opt/app/vendor/twig/twig/lib/Twig/Loader/Chain.php opt/app/vendor/twig/twig/lib/Twig/LoaderInterface.php +opt/app/vendor/twig/twig/lib/Twig/Markup.php opt/app/vendor/twig/twig/lib/Twig/Node.php opt/app/vendor/twig/twig/lib/Twig/Node/Block.php opt/app/vendor/twig/twig/lib/Twig/Node/BlockReference.php opt/app/vendor/twig/twig/lib/Twig/Node/Body.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Array.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Call.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php @@ -985,13 +1118,19 @@ opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Function.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Name.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Test.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php +opt/app/vendor/twig/twig/lib/Twig/Node/For.php +opt/app/vendor/twig/twig/lib/Twig/Node/ForLoop.php opt/app/vendor/twig/twig/lib/Twig/Node/If.php opt/app/vendor/twig/twig/lib/Twig/Node/Include.php opt/app/vendor/twig/twig/lib/Twig/Node/Module.php opt/app/vendor/twig/twig/lib/Twig/Node/Print.php +opt/app/vendor/twig/twig/lib/Twig/Node/Set.php opt/app/vendor/twig/twig/lib/Twig/Node/Text.php +opt/app/vendor/twig/twig/lib/Twig/NodeCaptureInterface.php opt/app/vendor/twig/twig/lib/Twig/NodeInterface.php opt/app/vendor/twig/twig/lib/Twig/NodeOutputInterface.php opt/app/vendor/twig/twig/lib/Twig/NodeTraverser.php @@ -1046,6 +1185,7 @@ usr/bin/mysql_install_db usr/bin/php usr/bin/php7.0 usr/bin/sudo +usr/lib/locale/locale-archive usr/lib/php/20151012/bcmath.so usr/lib/php/20151012/calendar.so usr/lib/php/20151012/ctype.so @@ -1170,6 +1310,7 @@ usr/lib/x86_64-linux-gnu/libxslt.so.1.1.28 usr/sbin/mysqld usr/sbin/nginx usr/sbin/php-fpm7.0 +usr/share/locale/locale.alias usr/share/mysql/charsets/Index.xml usr/share/mysql/english/errmsg.sys usr/share/mysql/fill_help_tables.sql diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index 5bb401c185..175103b39f 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -15,7 +15,7 @@ const pkgdef :Spk.PackageDefinition = ( manifest = ( appTitle = (defaultText = "Firefly III"), - appVersion = 0, + appVersion = 1, appMarketingVersion = (defaultText = "3.4.3"), actions = [ # Define your "new document" handlers here. @@ -42,7 +42,8 @@ const pkgdef :Spk.PackageDefinition = ( website = "https://firefly-iii.github.io/", codeUrl = "https://github.com/firefly-iii/firefly-iii", - license = (openSource = mit), + #license = (openSource = mit), + license = (proprietary = (defaultText = embed "../LICENSE")), # The license this package is distributed under. See # https://docs.sandstorm.io/en/latest/developing/publishing-apps/#license @@ -54,40 +55,23 @@ const pkgdef :Spk.PackageDefinition = ( author = ( contactEmail = "thegrumpydictator@gmail.com", upstreamAuthor = "James Cole", + pgpSignature = embed "pgp-signature", ), - #pgpKeyring = embed "path/to/pgp-keyring", - # A keyring in GPG keyring format containing all public keys needed to verify PGP signatures in - # this manifest (as of this writing, there is only one: `author.pgpSignature`). - # - # To generate a keyring containing just your public key, do: - # - # gpg --export > keyring - # - # Where `` is a PGP key ID or email address associated with the key. - - #description = (defaultText = embed "path/to/description.md"), - # The app's description in Github-flavored Markdown format, to be displayed e.g. - # in an app store. Note that the Markdown is not permitted to contain HTML nor image tags (but - # you can include a list of screenshots separately). - + pgpKeyring = embed "pgp-keyring", + description = (defaultText = embed "description.md"), shortDescription = (defaultText = "Financial management"), - # A very short (one-to-three words) description of what the app does. For example, - # "Document editor", or "Notetaking", or "Email client". This will be displayed under the app - # title in the grid view in the app market. - screenshots = [ # Screenshots to use for marketing purposes. Examples below. # Sizes are given in device-independent pixels, so if you took these # screenshots on a Retina-style high DPI screen, divide each dimension by two. - #(width = 746, height = 795, jpeg = embed "path/to/screenshot-1.jpeg"), - #(width = 640, height = 480, png = embed "path/to/screenshot-2.png"), + (width = 1200, height = 1000, png = embed "screenshot-1.png"), + (width = 1200, height = 1000, png = embed "screenshot-2.png"), + (width = 1200, height = 1518, png = embed "screenshot-3.png"), + ], - #changeLog = (defaultText = embed "path/to/sandstorm-specific/changelog.md"), - # Documents the history of changes in Github-flavored markdown format (with the same restrictions - # as govern `description`). We recommend formatting this with an H1 heading for each version - # followed by a bullet list of changes. + changeLog = (defaultText = embed "changelog.md"), ), ), diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index e8dc229028..97320a2b3f 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -20,6 +20,7 @@ use FireflyIII\Http\Middleware\IsAdmin; use FireflyIII\Http\Middleware\Range; use FireflyIII\Http\Middleware\RedirectIfAuthenticated; use FireflyIII\Http\Middleware\RedirectIfTwoFactorAuthenticated; +use FireflyIII\Http\Middleware\Sandstorm; use FireflyIII\Http\Middleware\VerifyCsrfToken; use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth; use Illuminate\Auth\Middleware\Authorize; @@ -80,6 +81,7 @@ class Kernel extends HttpKernel // does not check 2fa // does not check activation 'web' => [ + Sandstorm::class, EncryptCookies::class, AddQueuedCookiesToResponse::class, StartSession::class, @@ -87,8 +89,11 @@ class Kernel extends HttpKernel VerifyCsrfToken::class, SubstituteBindings::class, ], + + // MUST NOT be logged in. Does not care about 2FA or confirmation. 'user-not-logged-in' => [ + Sandstorm::class, EncryptCookies::class, AddQueuedCookiesToResponse::class, StartSession::class, @@ -101,6 +106,7 @@ class Kernel extends HttpKernel // MUST NOT have 2FA // don't care about confirmation: 'user-logged-in-no-2fa' => [ + Sandstorm::class, EncryptCookies::class, AddQueuedCookiesToResponse::class, StartSession::class, @@ -110,24 +116,12 @@ class Kernel extends HttpKernel Authenticate::class, RedirectIfTwoFactorAuthenticated::class, ], - // MUST be logged in - // MUST have 2FA - // MUST NOT have confirmation. - 'user-logged-in-2fa-no-activation' => [ - EncryptCookies::class, - AddQueuedCookiesToResponse::class, - StartSession::class, - ShareErrorsFromSession::class, - VerifyCsrfToken::class, - SubstituteBindings::class, - Authenticate::class, - AuthenticateTwoFactor::class, - ], // MUST be logged in // don't care about 2fa // don't care about confirmation. 'user-simple-auth' => [ + Sandstorm::class, EncryptCookies::class, AddQueuedCookiesToResponse::class, StartSession::class, @@ -142,6 +136,7 @@ class Kernel extends HttpKernel // MUST be confirmed. // (this group includes the other Firefly middleware) 'user-full-auth' => [ + Sandstorm::class, EncryptCookies::class, AddQueuedCookiesToResponse::class, StartSession::class, @@ -159,6 +154,7 @@ class Kernel extends HttpKernel // MUST have owner role // (this group includes the other Firefly middleware) 'admin' => [ + Sandstorm::class, EncryptCookies::class, AddQueuedCookiesToResponse::class, StartSession::class, diff --git a/app/Http/Middleware/Sandstorm.php b/app/Http/Middleware/Sandstorm.php new file mode 100644 index 0000000000..ff4093cede --- /dev/null +++ b/app/Http/Middleware/Sandstorm.php @@ -0,0 +1,72 @@ +guest()) { + $userId = strval($request->header('X-Sandstorm-User-Id')); + if (strlen($userId) > 0) { + // find user? + $email = $userId . '@firefly'; + $user = User::whereEmail($email)->first(); + if (is_null($user)) { + $user = User::create( + [ + 'email' => $email, + 'password' => str_random(16), + ] + ); + } + + + // login user: + Auth::guard($guard)->login($user); + } else { + echo 'user id no length, guest?'; + exit; + } + + } + + return $next($request); + } +} From b68d5c4374a5b509153a536506f52defc32f3e43 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 4 Feb 2017 09:02:07 +0100 Subject: [PATCH 028/276] Include CSRF token for Sandstorm. --- .sandstorm/sandstorm-pkgdef.capnp | 6 +++--- .sandstorm/screenshots/screenshot-1.png | Bin 0 -> 180984 bytes .sandstorm/screenshots/screenshot-2.png | Bin 0 -> 227686 bytes .sandstorm/screenshots/screenshot-3.png | Bin 0 -> 286366 bytes public/js/ff/index.js | 4 ++-- resources/views/javascript/variables.twig | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 .sandstorm/screenshots/screenshot-1.png create mode 100644 .sandstorm/screenshots/screenshot-2.png create mode 100644 .sandstorm/screenshots/screenshot-3.png diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index 175103b39f..c0493e5fb6 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -66,9 +66,9 @@ const pkgdef :Spk.PackageDefinition = ( # Sizes are given in device-independent pixels, so if you took these # screenshots on a Retina-style high DPI screen, divide each dimension by two. - (width = 1200, height = 1000, png = embed "screenshot-1.png"), - (width = 1200, height = 1000, png = embed "screenshot-2.png"), - (width = 1200, height = 1518, png = embed "screenshot-3.png"), + (width = 1200, height = 1000, png = embed "screenshots/screenshot-1.png"), + (width = 1200, height = 1000, png = embed "screenshots/screenshot-2.png"), + (width = 1200, height = 1518, png = embed "screenshots/screenshot-3.png"), ], changeLog = (defaultText = embed "changelog.md"), diff --git a/.sandstorm/screenshots/screenshot-1.png b/.sandstorm/screenshots/screenshot-1.png new file mode 100644 index 0000000000000000000000000000000000000000..f72ceb48e783b52be71ea32652825da41f42125c GIT binary patch literal 180984 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

rijKTAv!rd;j@cOW@ir61lzKysc%Wml~QrSyFG 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%0Ak#nvAF*Tu=^oP1QOu;BJvd{fDy=*BSA<> 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
S*%=g^Gc}`pgVO3WH&-Nw4 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

dvgRHi+IlP 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 z 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

aQL~w#H?T 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%0AT8!Ag4n_`K ztC+2o;~}xgNxw$!ChAt!1;+Cf;?zIW7R2GO+5LFt*BYp48_vM7O4aAR^9orYd&FzS z2dSY0urN}WX4{YZi2+MM+6&yMO04Vk!C1xyaOS~taAhA7q5Ix&mvw1n z<@Vm%4LqP2_yC7BdJY6MRO;6=F*7T@)1>?fX4YUJK*ALk8agpC;oHDhGSSDnFg@_y z>bdN%^!mOvUmxRdz(`f%t|Q|!(NNCv(cXC|=>_p?yyWKN!T$QI+2^zt5%3Y-R{QRP zvwOxr``5%^-y+fjG<4WQllv$)$u-#{Bx&|H8o?xVo;rbxQj+phk{g7NRo zcW0Nx&8SAyujDB1k_$7xE}hNXPF{g~9<>xz8*P<#x1*QdK6=f?CP zaBPwc+4#~)YhlgB7?SMy1h^7|WmET4fp|*SW6*+_G!aBCG_%U62oXenbZdQFJ~?gq zA>XHV*{4jQr3$ueT3x^xw;Us_-LeLx=>3~64GU;9=!M(RR=KX4-qrD~kTOq!tif4> zJqO>RPlzfiQJA<09oQbz%XlQDU)U>k?D+gdR<^dbKwJwB4vxf&wZi7@*Qu!>jy^mJ zGFVYk0?kSW(ljl}=AxqKpveVU<*-00DJcVk#c^Q4D^om~kGYwenp!9{QBBp;-F;ur z#Dj^@+4t$euE*1qo8b>3g553Z7oa@30thM)(->J4eBK!^%=JI{1US=$_;nRpOyhB% zEV{=>Mn*h-%q)9-4Nwz3(;|16Z<+5({3v8-BsvR6XOMreVzd%z_av=RnIziIS*@x0 z{SW&DakyPRua26Z!@}=dHb%YfkZqyeYK#~&>8Es=+nK8YlHK(`gmT)qM=^$jERinHw}Z21p0t?V(Px+~Sg zs~d+70}j)*7C+IiQXSr)G3&Egr}%GUCNC3$YfTphg2~%+{Y|IG(ji~a|$I_Br ztz=ayA-g3>_$_TO3ibWu^*7hRK;A*-+4RsA^Aw_zWZ_oZ#@V3FRGRLV?&C?vNrSJV zIvB?~V08pyk0CkslydX-L%q9KM03g0 ztC=-@YjNwTo7XvkO8RHyxO|i$(OLwVtiD5^rKZP{$FkHM1Oq;3m{$wUkW^LuIE5?> z7aORzs}+aso9D@m`;Ba@^+X8^34xfbqqQjVb?Oxmc@zZOXakD8#0ZXKlQCrdV-SOc zF-0wMPcm(Lb_c?E$c5Y?+Rs23le_>#f#;+PiJSt72n+o!1tcF4pUn_r_2`^JsC)dw zhY!G;Bh#@Nc~^|xX)Qb)K3bF{VlRu=PRH7sVNY`E)hCM!0&;S8YYh@0jg%>pEtGto zJA*haw^r7b@=N<;m6%SH-T812ueU&`6~Anzd62g7`_FfK{XVBzel2&;L@@kcTP%txV7g zf~sn&9nj6jQ?EZqkAHu_)4ddY8*bF(Y;i66WWt1_3{7XVGeo+hx*+^p0%($d%Jlf^9vE(6`Ml8?st;dMsnHad@n-aC$hoq@V-oq|4(0^3hyzau`lkB2-Pn1emr7 z!C(ZD>W?cWv)9i6rwCxA^$mOi4fB$(YHLb-=68CXUMMt+F?$A>7BWygNZse}r&-|> zLzvxa|J*)md<_@Jplp_u6HZsau@k`l%`Myw%|TD+1$&3-+< zS39rOY1T?afS`)x&X84<`JW<8oEln`xWX;CzndwSTEFX+V>6ktSN?M5J+pnapdljj zW~SWKTJC_Su*S=?aLAT4QF6FX8d<3{9IM3uEZAnW?z@$Rtk3pWb49c+R$cEzc$;@t zocS%IGrVLGNXZ-=57yl*1BVm19WJang!6ufTAD@hs1p%HFB-P=MBs6tw$g}t;vb-! zBDd%01~e97BbZQ{eX{V6hAq{)y4suR70$r_&}1Px(bg3|cjwAm2^Y4BX7={gdxa#d zI%kf^gw97=6x$aF+3juPng~sWxJ17^T8DnQ1mRdxFDSd82xO%19zO&5eARVMhbwIy zSd@^Yjestv6nUC4Z)ePLxKO2hK1^Qyr%!iTH&pUCEa+315W`YI_Hj#21>O|%~);?Ha;#1Oqpf&qdtVJ2gY;rA5CL z!G_pGZksup@U-W27OF!zvHfvB;tY6M*+ovSCq607km;Fwc^8xh+{sApTmkE1n!o2+ zcND>^U(`$&pOP>&NdvWcr71l@jr{4+i!X1F@@f|o*4vpW9vo*?3JpO&iG4kFFU@6e*- zPitTMg=Aw0o{@jf!@Fgkg2n8Z5Waz|n`_jfN7<|X`p8}BOlnHGzS3B{I-j7<&#D=d zx$#Slr&ACUksI>0rVhjO&6q0$C1SJZ4Quq{8*nccb6gVWst5zAs-njUsj&QDNbh>v z@87B%bzY@>4z2eII9su){BJ#0MH>idWYkt&FYsuDW(xLRaWuX_MStjs% z@A(GNgb|DgKVMFQl8Kx5o+4~)=az{^JniJ`6~=>KU$*9?ntDR@%A(&ggeew6KIsT)OL~h`eqB_x&oe~zAvqnU zAx$<-*}qkTFvIZ|or|p2{r~*UVo`(yVnSXkKoc)7il|alQJ;JnPKYQEejTXh#M;F= zF;-&I+GEQ6#A|dUHpK9{XKNDr+*FjmFyEE)ZPpkX39Q#aRW)APhY|^Sk2y@3yA|Qg zo(JU+-R}z|%H@GZUWdMM@YO6*u~i<*LKIJ5tmK>)#6X4{=8=M-?Y%&l4gFa87FVk8 z0flhQZx@*2MHzMd1wmP&qBNC#bl7=Y+csS!F7I@_>gkZ5nJJ#}PtuV^z@3GNa|jC) z=jS^^@_z(^84xTD84KOuqXc{bev=`(9Qt>=ku1Uc(^xa~xQ@_*;5;$}=>q7BH>};= zc@)hW)F3jZCf4wnIo4?V5J9M)GfoZUD7E97w(NS7UOWU~OdPnFyeJy6J7Zwk}R}0&IE8p_p%*pATmg712Sagbx}YnTIL%ns7W1Z^{9H zVI-&eSIdG26`42l&B=McZhl0XWgMLwk5+ZJD^hZOlH%s7p?B7*K3y*KnDam$m41$P zmcmik}_C) zjHq(O%#Go-N`t5*k5fd2M456JVu@I-K$$M>HZUO_)u6R^5lSA#Y~tBeKh}$ zM56;r45Y(5Tv*j9&`D6SPN4Ch$UMDZMd=c$Tc|w3 z&{llC%CL?R3AIUpz-_KF)R{?`JeXl9Xoa2o2t4wKvCxGJ?mq5)K^M1T-Svp{%K>a7 zpQ06--t|gNQb2EnXItU^r%qK|El25A+TXTsE1+YYnr+>in}0gK(lSvszXc-vyr+I8 z%<{UYAGr~^Fy%J(TnSAc4>to(abUhI+A6)rHaUt38X{WCDe4*W^IDX+q|PSzjFt>a zxSFsXtD)FY*7dJ~po9y!eLu3p2&qE1I{)ho-zu##J%;Jw&0UCbvh374kJ~Aut4(LR z)4`AXh>qHcEnQtUZh4CKKLe0uc{ zUcn4EH?2N5cchP&r`7?%R6)5yNh%L0`)M8oG4azhjheW{!TYR^cAkr?^s2KD`Scg( zmp+3vjlT=a|ATULPy>9!tN6vE|HU_?0KReJY{C5B-t#{Y$Ew#ozHyM^()sT#&OZ0} z23dlA#J^FD>x2hhgl8>J`XByHy9ic;cDCPLWV_@NpdkGP=Y-`1>-oogKENtR^Ie7i z2TkFC&q&1i4^(oU0YDPtTru>Vzjyzh@ZmKyOPZ?b`EsrKUu(NZW$YmANHQP)Kt%r> zV;}&j#xT@~qLlvzkN(+`8ukET?OWa;-~UBq?q7Fe0Dj5uHHD4De@HNYe`M7a3J@z2 zoO#55LrMRCgG{3E_Nuz3g`Pp$ezh}u?oC(fUE{AWd9_I+#V(D1*9=)-ow~=Zn00t7 zgiUMATDtz)KVN_CeaZ}VZdnGJ72h^cEL@st)QzpIJTo?S;>+|S2b^NhE1!`n&=i@5 zt?hXsPG@Fh=irA&|7S~Jmd2;-w?7hV5-}QcX z&hZ;0cbn4pkdh1gWZS(u%m;*=Zq4l+ye*R}MGkh~?fZo%7>ampi5Et7IQ8RMjaY|` zatgDTv)LMyf>$raek>3R6IFULyB=xSO-+BCE_k8d$-dGT$f=0_>d%$b`3t#m=|DTm zZfK!7xd#`CY4I@k4JJO*p{V^*U4w@K%Q^c})ES#|ejNh`g*+2FDx^{UA!P@cC!0!c zm_L?Nl=j~YaM4Qjp4xSP4@8IE;m9E0Z}}ashM{4r=f3{n$MEoQKv7pO)hfsatQXOr zU%2mm8Nrl(uH~tG3kXS`wB`Z6J0jqY2=a*me}3VErILh1=Teg!V9Gyex&Ya}_@PG) z9XFMV??NHcmnSE#N%HQ1W&s4dAH3|8b5lFh`IeiL8U*6XX$ZMbG<a|N=yRPCZIs=lg%R)9RKk1~ddkt$ zYYR_j_}GPY=+2j3DM~*y(~wXpuF-aSf5^4_<=iP=DOUaS2m<_BW7P*yAw3}~RgY$w zC=C_G_&MWuZ{qsoet=oZ2|^*(*z<^H;`fDGEX^MNu5UGc9fiL%K_8B$*UyVxZYBfE zm1e{DK(q`SL_kE``u0td^Ua$#RQFNa@5hR`=Qw)6Y1@r@d?-m!UWFm?R z2K+uO!%LN{XALxM>bJ-m)HTtYkiTwTOEmhvzmtxsV96Af1Wj82a^?zU- z3eUnd&{Zbm^H~c=sB#Jdld+c_0XGfwsM*0%7XmziC3%R)oJ>65@f)rU8J~zPbj=VmwiMj}y*hmLXY-3_krNZtB#629#5 z?-E-d#*w2Hgf(Zs@gA7q!VUw>-8IWcP^Y6zofvJN8qW!^Qe$a4NSRW*+6tjX*$L%8 zN}5UA_hXuRo>^PeQ~ll9$Tl47*j{*OYCD^q$0|@o&c}d1A;)H4Y&=iWY=H2rXnl*( zCP{c`nwGU$wGixSa_V$&PW`gKfG#s^eXW&+Jq=m15iq=W*jmr`=EH*37-~|D1E10* zzkB<(0`StlquZ)i>aZKPlYD%ppb#^r12RME$Zfl5!dIl|Nba+PB_(ne3ExsY8*I?8 zM2Ub?rTC5Z_^}jGH&%RM%jv0mj5JmBCjb*oO=-O-E+~Mp6z#jPjmLfS_b#h3TyA6G zKlTp5&w0J7*sERCAV7iOl~TWE`niwk>N{uV@<%qO?3D_@GP~mlYU^{vMT&i5t{G|} zDb-G3kU$TiFH>!;*@&02j51}4WbEOIWRs4S4VTv8(M9=L?pQgK*^FSxut_6J2Sd}} z$BUYz#8k4tdaCEF_sr&*smfZ``0N$a>-LQTian+9+4t@ z71Of%x_Kw^uxgg_E>hl=)wmzk3Uf4u7bbTvpyg=ubKoAcVa9A(^lj3GtBgkPeO#z9 zJn{}h{H+ebj$pv4kg4NlrAC1{o{yygNcd$UcB@<+BKCu-obX~QEc9YK03#tYu2HYU z@>MDEmKqTsHgQDGCY3kqHWgYhi!ATbN#(>0Kp zPI*_|&(6RA(X90P0bG&7n~Axfqbhd;7v}A)tpbsC@p1V>Ggxy)1?u|^U}mO)5I~8& zED0Kpw;FwRtOe}Sx$8H5_{JjcJ7Y~MoZE(QE9Ho$E6&SuedTX9X;wMo7r*H!_9?kx zn_#Fa#0%&griQ9tboWN~(Mr?2l_{1jFA(`kxV` zr{8LOYW}b^axozUSRA6%-%BkEzpZzQTH037U$0s`!lR~*WEA;6yx+e}KP8nsa_al6 z-Y;5Ml{TushsGthO4Iuw*BK*Lee97osYkXff$#Q+c=a|SUK~8->6pnOoX+;sLJZ4r zDN(Z{d(3<)#I0UMiUwlI;^&!CjJV5Obc}{wiQ_92>~A7bu^m5XKoq}Z_RCf2gu5U; zf_@~+l8WmKMTi3V=qG%>r#s`oIY=|gqsgmOsqanFiJ#M%c&yX- zvN7$!(WZJ!i>(-0d8r^nbBb4mu-S4~aBryM#kp*1Y*;h!3{O$g;m#={mw$Q)US%JT zPyy!A!jVm_?C@umQ9uNXd;IdM!yrgFXz3b^<0Xd8bOfzPtzm;cdH_?>~OQ`{7q)M!wWmj-?a9a&xy(g!G*J*Nh(-kc}qW@h0B$z#= zcuURm49Mp`o0}6<(0}>-`SakQ#O2J)41mW+$GjmVGQkYKy*fNVuOtAk63qioFB{=` zgiemdjAg21Cb^N$Z3TV8R3e>k-2RI)nAJy|(J?0rFGf$@5M4lsNwU7F(Q>@x!hx1` zL$kXE51&owy`f>G+z(+V^4x`DgpLbHrlaZsi9KalfH5pgOWhH>md>n0JzgX1*Ts={ zd5>r7`ds6ePHQrFRX>6DZIK67~J@PE3Wtkeewt+?u{H**b77_q$wDsofmHnlxe<HO49y(wRFzJo?^dt$#7{BRv4=Ps99KW*EU)$Tt%21TxYmP9epswgZkdqtH zsmgHyc!rxB2sWwN*=WR2W{l%JYYo!IHHxmz5gDuV`eTc{nrsh01+s5Cj8UiM-|ZH4G~FcOuQnraxgxCkG- zF7tYuxfG67Q>5&{Pkg zw!hPZ65tY*YL-1)xaK;4$(h!|PqGlq^(0C~rq%k1)npXXtm%(&z_mj5>oLL3Pz{iC zv}KziC;Ae(kFZ#aU0aic8fXePvIZugCgNrt=|;t#hm0#>eX+lWTQK5{-NZawdThN6 z{S_R7r#*A@_U**n(O1hbJ0FR}>o`e%dBFtI$v@aQt4)2NM7k!(OCs+b z(9Xk@qC! zsV2PdTM69ZccAFaPezdcw8tITc{r!PxCf8H8yENw@8*8@cci)2{Zq#M{bCjWz87ET zaY_957U#=*ZA4&^ebS#p|HIC>4!v)qv*`ZYTm9L>CVtN~7)@dQ2Wa@CjWC7+?a2RU zD7g)3G-SJ`iWo(Udvwoj36WF)7dxWi1m7?qrJP)KEBw8b&RM!(VT>5*lln~4NB=p> z)R4}1rIPN-lHP;lp~J(dg7wXt_6~l4mEO7gS5sK zmTryDR&)tVQ)H2b+9zI2A^xD3Vf}1J>Z+?qo3_>NK#s2YjDm++3Y*A@xt^yaiUaRNR0= z=p_jpZaYIB0htLf+BB<~b8OJn)dfLeM@P=4q1oBl0CEIgwGyhiGrkRb9lLyO@2WL2 zu`s8sP@cDJ+=+?t@(b%+_mwxQaduo-yUn4el8Q}g(WMT;!eGS0#CFs5`LXIT7e8B! zvo*XLujMV>WZZP!q~*i4SY*;c)sFUD3h=Dknd%+t8Nh(RyxXj`wqL3QPsL7KNjsVf zUOS7;N+Cc&!^p+MfOjH^GHK=2ER$)2aD^vQ`yxJJXR6^R{L)WS|GiGfGJ}VAeJz9D z^;;;#X~EJ6SrS&{B6#fEm5ze6TtC%)VR&~M`io~#(ZDO^BYHfFOLHX8k1yNjevTt$ zJ@o+1ar?>sYNLh^soZ=5Fj^***gsi(*xcM~ZWdx_hzrI-m(`AJ)Y^Zo_*J$4F6&yobd*551(jmIFpjydZtB?J1HY<$t_tCK=YzLLpfFnU zwst+By!#viI@j4nKqe<*?VmiO)rsl(r5yKQ+ox#UMR!2Hrl?Bl#Or$=VXahvU) z{qMu#s>bE_tn?qrSOn*$=Id-n7p-lVyF8E-(S4cq?ccOcTz6Dm$p!d{a-GrLlr5L5 z&jmlXzxge->F}M1j_o4qj3^<-=!h-86>PiKW`={C#h24N}g8=vT1QrPfk`r1@tG%u8u6I zMLs#bP$J63X+M{KG%-!OTrEtNl{0SnVZX}JX)0suWpu8v$W~k7nbpE+A$E^rW};>l zCt3OQ4h!F4pVJG~vRxjawdnwiP_0%)5&~!0%Ai0spYoB=tSorksY78oJ7S)#7)H#Y z0owgabuR;wf$uHt+`OXHOmpOF>k<7+%gYY+`o+rWuR!J>SEG4kg)iX6oAjcQi(Lci z#O#l=a-B*P6qL}h3~-(SRq-oG&;&LBcN^q)-WO|8E;ylRhl9ENPAkMttq;RMHfTU; zX(<@b1KSQ#ce>cFs1ORn+UIB)q(bgHQW&D}<<7tv2N*v{4Pl5~P}n-Gv=W|ReBK9^ zv^kokUxtUXg*=#eXi|uq6XN2^!LCY520wom($y;vM#cSrr)mNysfvmyE1a;o7x$AT zO5gF@iFZokzjvs;W74+Xuo|d;d*5=<41M!35#tj*t{)3k+x#u?4fKt-(Ni8YO4fW7 z2~VMX1tcuR8TE~UhncU~FfVfjdhzQEN~sQ&ZcF&Z<(q`a4z3Gb<>^41_Gw}%2ef!<(&E|rQ@Ya^y~`J(RUYv{pr+J5ZrH?^WDfl zU%ny76oYYorj6}O#=8vV-^pG`rQ3l9GE(9F1D@~TKNRqOEZ1Ktrhhll{<)crx&nbk zA?+33@c?ZT)W(OGbmcMHFCLzvhBl#mjMZdRFRD{`F`IW6*DSdH;%2&%e z7#fws2SLiYyq$&9nI2vvCD#o(+VBIWCmW7x1oNRuK;#s(tnXV=gk1o$`&cD7bJThI z<#1$B&#i*&;X4_X47TL6JMecPq}P7#-7{9Q`lV#`+r}&W7qLNC@($6klUb)1U1=|; zJTodr_AM)C(c+uLn76Z8>ltFc~S!L0!Ha0Jvn9h1fH=JnlpenX#F2{pGiH zJPis~LdykJKe+Zw)x|}qxdTi}B_$%!NkDU7hwW}8Cx=AgwA_sQ`8zNaOqHiusI|i2 z!8K#Q*C!d@o}>aZY}pszfY;~)?em?&m#{R+hbt}vq#c*TPU=|Gaj~&P#Kam{<2io6 z4sLeUf?~b32m-88G||?NfYaooZWT&|wdMSI`doik5Jd@%6^K>t^?@GxLlUtA z5R0N;^Ag3ccp_S?R~FVwY95p0ZR_u`m2are{qX`2q3U{P0ilW&PCSnvL^qe!-1LAdMf-gZR2bI4QG|Om5BmgDLfRfokk7*MI+{u zvYNos<{r0PR{S_e60+h~N^-pshzip2`ahGJ*(!`rMhL|azjudcWss%g;PFuDyyKpS zzGcD*o`lQ`3W~xBIh>6*b5{xtcCZ#_dcE%XP)l5i{wpzLW`ucKBHu{BF)> z?dhu`gYLL8m_!Y-=m?03 zGn0}+_{QU4`Dwg%c%b$ARbEjc;(N;QxyMi1D=~V^&l*ZchH~mpJpw1QNl)}?WF#^O zf*WNB@6$~$;$+S2FYf)?n%r!3F`9oZ;B&C7I_b~hPoKIzNXgIFW}{Wyd3TgMpWtuz zN+GQufBqzk#s>dRnM;%!OZPZD#aSfjc)(}Fej#g)XaFsqK6P;I&=jvtt;S1pQcgL@ zqN|5rt?kl#IwtgcXn#V{+|gW0$tGLaM^z(!5u1xInA|5yKbuv4n>0;`ZeCvj(oWQk z^)7}}riX#1J67-8p@4IYlm`5-%BQ#k?ShK`EpowhgrXDm${E~BQ0ki7T1phGyqZmK zmU%hPtc`R7QWcJV_J)L5+TIiwXOd@&R#a=a<(2ht*9TKV2780@OZ({}sLwU+KE%h0 zj|S4@I%s}B{vpN<5nZG#!+8aa*Ee9_*!L?*$bOUx`01f~rapa@45h-~z=QgtrziT) z{Xp~({mw)2;4}1>XZm`LCx>BbkQbQ_x`g))&1D@ltg zG!*w^de?J4-2LU)hs_Gab=bWGB;u`PKAV`8#H2as zVJG3jPBGGO=~2#;J3H2mK6BX!-!ZS+^Jqu}^YO4?rc+q1CNyPQOj^=U?g?VlJD7bG zTz*Jb`FMLRA3yTVy|jkP-FsR^KN*y7Oc~29iAc556J=*mmVaVz^vE3ABkR$aV69#_ z-bo{k*~NkLq8E5*gLm#TshxQ>=E{jj`L-MGx|(X{va8|I_=-!mC&EHr25;}IQu@Yi zk0ZX9GepW6oR=`<<*V2@8)%}sbyGb!dx!Q8f`s-MyqCb^w_P~FO6S_`&Xdlu>n?JzY|hheIe$?fIF1GOiD?^>786Rh-I%m z3OM>03CB3jXl>y-vnkr=hnY{bgJE#uALw(jA-I+H4}9z&72I#{cO`G6nFd$>Fw^}_ z)4U7RX-*$8?l{)ql&NWM;}`+eW<0Y-eaytetc!FCpNFO>*lS0@l&vYoRLy}gJ%uR$ z!hV?2@mZzyP&|PazcLIbOjRnu>wp6hb3BG<;71D}a@lL@DVO+rr3(qONi$-b$5T1_ zVCZ;s?nsF+nMt~kM`f!vr0`G&ja1LImYs93IHRJbW#BQMM!XsI{I1d%wR(>68xXX8 z3i6q$g$Vq%m6cw8sXFM*=Hb}_n*X`TXuGonTMAl}M}fdr40wgfZqn2dW{C=T{Fto* zAnQuz(O6zDw64i+mhHm38os6)N{gA?WIli{FFEJ3*x;1QVG0)uBwAVgl4q2Z3{ntP z2=~&no}{bONwx8<R3dw-HP%|!X>U2~ABD;7%4R;g zs$VtsPQ)>Y==Sey7WVeiuSN4J7<`GAv|(%;uBjgE%<7zs(!wtJ4!UYO`S@*(gR)*C zd_y(V$@vnR9)l2)=*f^wNNV;$=%^6?2r)H5HT)xSDo(=daA%PtW_$u%JQBJ{Mv6`$)Z)pa(ExHN9 z?;;WWpsqeXK43;1(b)pn%lS*Idut6OtIL$HuwC-iW9CY*<4umqPAFGaZza{tJgBJT z$8oT#;gc}BVqPh|VUd&xkA&5lUa2$4PQf^}&Ttw8n%JVsWjD;}|m#MXKbdah$ zgNlKDyDV07hDIUrBr*XA@G}0(*%{`tl-l)g@?7<2U zVs)lhbvD!LUP^SVl9eL|3FrX>S>tZ9?-D|>qgA9Q%_kgGi379E?E3{Gv=U}C%{9-q z9P7lXY%U67;#NtXxmn*_&c{3`-xo1}8UM_8d!QTt;I_`D&Nps2UklNP#I5~rL}xV) zesxj0Bt`R+b}Uo3X4^8Z?cTo6-PGyrb=E3Al3$lv$Gp1tj|+>EuE%dyL#pH+tPq`F zwuXOAzwliSRB&LBAjrHhl^UF7XZ+j~_DaIiP21F=Yh59(rrTKpj^i(+k8%vZX|zKz zXbFkNSoI&=X!Qeji9NqbCSi2LPzfUEU@2kJkrdmN^?Y9H1ABgN>y?*cuQ~%b_7pF| z#kk1OduAata`bDt)j4Cc{hrhPQc*```RC&aJJ8=dF>BTL%jvX&7+OY+S#1r6+(S>n zU$J*yN(neq<=@=8yZoD!LgValk8v5T?ER00iGL)(xJI*3(8K=+<6;9CSNTw8+rN>l z;8DO=IZc1k_18E518{*Cozt`cEYnuV5KxNgf&_TbKE~W38B28HE1$ah5iQ;2~-KDEDQ|zE#Up<1Ao(H zu^Qd)rB@>fy#GA5{yy`aRrlnZv)zr=e{Wfxxc_B@glGP6ZvWY5$GyAEZ1Kymziv(c zybaJvrF$fAcTX?*-#^*^kc$5P`e1mrY(NWoS8J~FfA;g&Q6JfXL;k;uITD0(Y*+-W z2`@dihL*DBF$a&VUpq2f4(Ph&E9=fp?3##C>YeKXL9_T(b9tQkH*u+J8X>{s)~)b3 zCE6MqrnU2I`E2Ee8gPvzOWQ5gS!`Y!wIgSi_{+GY#Kav!@X|o#dojHm({@1@0^-Tz z`o23iztxO!N=PjHOIL{1_z~WaEfvOw8}s`Ndg&c7%ZyZpG3%M*IF1pIq9ZTUhUDbd zY%HpWi_i4(KN2kWmagBsyKheAEprk5beD7%nt$sV1!`N#w3u2LmRw{#l#2V#a(+Z% zbEpsV-H(YpcN`k@o^Fat+n`m~)%~>|$9@1FuCwor0Bs-8VOFGIaAk);GmMFeX;#xX zN;zc&6#0!V8^Gi9H%ar@Kv7W#Y-WF2 zeA>tjawp`^FB@u#>bJfPvmdgq=;}R5!%WRjVQ$EoYkq#0kukHdrZ8`oq-Qtve(AXX z&4$5}qprSv28UhU_00PQKGGZM$z@&^7d;b+)$!QEa?cJUb)z)A%mmr@f+Q`=ruD)j zZ8Uxu6~J7^PuC>lzt`P}(gUwVy9E9(gD-rYef!g-wIw>C1Q@@Wkq8(n%rIyDdt0#qfP1!ZPQN^Gocl@|3cZ zBG>4C5FTs!Fo&ibm?8ShKj*tM6&ctC<$cKeip5pPsmj2a=A=TDtVr49 z;g3R-&EZ{A^-FDvf0uXP;a+3CD{}J=m-Op z-o9vPXb_!dfXQHEVFA3TLt0Kwi3W>AW(&A29wqEnJgr6S(_)$iZrZ?I8<=pjM}Jx2 z&gOH-P$zhWTT{BcyliS}3M@Po6%;Nfb8q2kkr$z8-D}dUOH1V9fh3w7!0dp>og-&> zWe4sN+*?skUx#AMS%mkP7e~Mq2P0Vt6L#M9NmfKNNf9o{eYv`t;x3M^N0+vWr|NCK z`&xK}z)z?XSB!nv#icf@_65=DmdVEqsm-p3At8*I3Ys-jqP?uCpOXt-ajj3}|0WV9 zR?(S^H+SmgfBJ^vr_LAE&;8?Rp)a-twdU+DMNcuW&AQ;A%3Tc&Kk1EUQl65_3k!U5^V z6J65M9ypm7^n!-R<-~F#BHV7v3Ka}>m4X@|KKBK1vMD{_;Bil1O|0`U2omD=b1nlg zp&U}oH?&G+HMJ-yNYLR1Ak+1+2OfjYOAQ#i94s|?--`gz#hn4k8U&mDy4QBTPDvpV z^Cz%HD>w$Sp`fjFtGt86+Mv6@-cT6)iurci>SNIb=fBTMm@J)MeOm zYlotzV^ZCOhdPM($63+N_1pAGb{!T*n4I>rntv(9*rdW zVIy0ut4uS4WAbs!&9x@m+&^+{W*e;ftRk3TLG>rI!jHXJ(_7y**Y{ge+K`--FtGRO7iP54(!`bhz0X@*tE)=sI2^9W5jp8IW6PPWa;Z!zR_`=FEZVPfpj z12-&@A-FJ0E2#pL$W?RgC>KLb0xZJuuCWsRS|b(|iQ+*8^e1NZ76GZ4N+{w2^GAoG z-x3p!6r8Q?H3@LovBG{vSbBT5EZYrJT4VpN24!02H_}1}R@yminW35-sPtWhv={VtHu2cf3e@?3(T=h7`CdEE9 zH=Pjo1%mhGG-;xNc)QqR{tWc(r~DX0khqL`1hfp`_p{aX@P@@v39=gcpyw73php>^ zgF|llkRgNb4D#r% z0l%!rOg!;0;8DCxOf+M}56B|49{vim3m2O^Op{+a2CJ@ZtsPjx0@e z1tyagG(0gIT0R)g9YgA(j$ek$gwsyNg|zti>vc2RsP>p+-6!81cawOwy@1V5+?SA7 zYq0)$IuW$e?;JD{0qu9O-ufi1Q;dNzF#8_x6KuGN}URG1LuT4Miq6L|lH zJ-)_J1`;6A)h;_)-E}u|admfnZrERN{1`ojL^)nTMw!u2njm=jjbrU{1+R4tNsY=R z9uZE)>qK09Jl%1_r{jj0G*1eSPIkXaFIXQRo!;QjLVw>1u0#HAQ98vT5?++I*s5@j zw5*=n``Ay`xG1*2`Y{Wk&D6=$q6($i>mdnn^1`fKL|V#GVUK@3OUuFLzsO}|+xgV+ za%MS^6ls^?3yEB~8N(z!C61m5Q@*zD%~gDH9{u>#ujgnot2^r&$4=yx^EymXVy#ZL zhy}8`TeB3lxEjt?+q2gJevG}}UuA_;ltNsq@)QN*S_}NtU1?ObI*0(;~w`I zzYH%eC*GjMxY!%Rt`uB7_b2SAMo1+$WR&Q_ z*T88k)-5IJB@&I{R2|-DhJe z+ALZcmwvedg_`&(8o*O*{bGKW+RHKHZ+3r4INo1B>=@H_7euSX>2|6E*AI%6vuxm;Z%HQ-6>+6>jd-H@uO^%4K!-amwhG+0*!ReIlS9cy2CIy%0B zpDtZeH$x<6I=1z|a6a1L@cnnvtPudHZj@?r#UJ%i-#aqE8>4mPT!sUy;W2v$@(Nkh zV|jAy(EjdA6BmBNWy3-QXbYV zs=Ws{+l|7e`5ccTnJja}#M!_ye)^dtOXA+5QeXvpa~qTY=37AC*IQF}LMqT%j6&x4 zMvn0@t%awP5)v9*S+%&zM$ppu)*I`yQ}zk5wI z5*h;wnIh^e=qKC|u`)z0Rim^%?c0tnj&62w_slSBp^FO+C12L&!?O_e=plM86*}l> zZtIbmb~*)WfI&(iyAs&UoZ^n!sdNT9R9>=R77oGRpeV*4s$yR97rX3%9rsh`&oPSy zc;nYALe2*r(d;hU{IbiZDV!<3DK;-OUNn^v6R=S8!z{bHhtEX7X0xw{u8m9jc=@Q9 zV5m9UYJcu9l8=__Y-KN+H2rC{YY}t@w;7IXR>sGfH;~Jt}+c>;v%qgN%qiL}9X8+JzzD%Z#7Ym&&h+Z2(nhytmb;|<* zyCKh4%peCLUfJ5Rf4#6{c&9raU8cT{6*L{uEOPcj?5CpnJL5-z9Di%E$6mB<+s?G~ z6pU!>x6?+AyAvXC?OPo}k$#bhd8dXzV+gu@KD6($CS;0KY^MA$rko4m)qmT={CzRo ztAuWM+#GR;K0+74KK&KmwlG05V^xt=eQA=Pm8}{1ckc5yI}4Toz*7FM(tM=@4uf4SYn;zdta@MqgphgW8L968^)(ahQZN z*m)?K!WH;~k^qbKCC}u5LkcyI-;6;p!<7K&Y*<_Fc^K4_-?&)2Iu%*`0P~&(Cm?dI zy*ASLb2Qesa4VM8I?SY^m}_c}gB!47tPpf|xKHtIJuENzyzNt8w1k>IEuhafvN%DAV%+s-H;eGxC+s?LE9MfE78dND|WL<)Y?fV zB^TV3FAtUl8qF9@w3CQm5Jc&H*3enx15VU_ZXbsQ9-I%9-a=w!L%`6AK0$bV`4$3- zJPY=J-vJ*=7ePR+!U-J-+WhsM|9%}Q$Q$Kf2f)jLL<*uj?LMiX`*X-YUuQ)-=KJS6 zN(Mm)tZ30=n4?_<|DD0(*V{$=xBmH#s6RS=yC|=?q9AJe?+LStLhj+1n>O{VpXe{N z&F?I$ENI$S>E9|XTMwgLyx&GipZ97obFHfzT7?&$+jI~RY+Z@bxx9h#7S0;CIQ1OO zf~=d5BE7qR@nLgl&w7Ob(X08>Jqu4idi~PonaeE8?LIV&4#|N`DE;En;g!(w)zfWF z=6w%$Awud=!IP$y@U2cbEVOV*l+cOwvw_VjboWa^lfN!deJ(`YTRFO9*|J+2_Rfx^ zwGdR)SBW(#sA{!a)IT{9EJyF(V~7YSC!>Fko~HLIYg=RQ)HC!km#&tkiwC~(xP=7C zq{XdJ3JZ--fQnI>PJ`2Ut`x>V z{;2GzE&yB}dEJ1k!|(hJ?L%|{oXW>|Sd^V`9f!ZMeCV zm=`az^SyDU@Y=*6l+tT_A zIaM+VJqvx|Q_uI~-U6N}(uFZIJJMuf1xAdlVu6$G5RE#L`5)(vPVsFg3n+G6DTsD; zeZS6S^Ovtw7px(Cgr-X9{679?Ir+fN=wz15rIBWdSb4{_ezlmOrP6DA&?$i#vQ*yw z;LcQ=`26sg{qPz?z5A1^cCJEda&}LeR^ChM_=GyGT(v6676iwyTNfI&uQ`l3RVrmm zV!sYYMytunyViB>S?)XKma@_HkR@lv6o;h|b8A?B;S+hSZ(gNQquu0&F>d4f!M0MC zDwnPpwpi1Sq~q^10)#;RBjeno2Qf1Keu%I8k~A8d%T*@b&bJ zg^cu^ojKNCOG`_en&vAMz6%fUkjT%^*9`9tW99QW-guPUI{Ok6{hqn5pNq=G}+f2467OPwzRdKlj@Cu8pgxgA^oU ze{=G&wEc@3xjGqgtxFBeb7i~*SMT}m(s0BR+}4Jpk$~fX+hK3X5gA;OH2kdB%X*|X z_-lw7zI80!sBgRS{@hhENoXZ$dA6cgq$N!DY=zRrTuzqBi#}CLCXSxmxI6}8G<^D2 z?eblL*n25k4QFpA{3Bc=A6o9VmaeZ$$A3stJ8X_yl@@c%iSTOD5ovvyZCJC2!guN9 zU-z?TDBiBf?b0=6>VWEF&@dT_aAgQEdKt<^DYth7YsP^ym73PL+k>2u9zjqc5Q+R6 zeWxzdj@A-*y?hO3Kp=xQGc!wTY>SA9sEEWJF{;FS)IznYn|}b%6el;gkq6M7`nk6| z`vuOa=$9eBm}5r(j0F)XX^cY{SAQ(v#MUi1y&KEkT2elJEDnzI4f>=c(sN290E?{Q zfdM|pwIK1F_86dR*7*uJjSP;C9ssa(fQ`A#Ew#jaRHyYLgzvN93ybrFx>ClXT0S9C z(lUOn3I7YbQs&Y72=4BlhehpZ{p}ZaBx?-1cGGEh)>iXY4Cy6GH4`OA%yHgdQ)Vk0 zHJi=Hoevd~zvLD>oxC4`bD}*ZzbVH0l)G(IDeEM0k8F{e9+#dad@t}t;tu_?CG4A| zB^Ch|_7K6~r?e7Dib}0AyPp<6U(4<`|@ zLHhM|?G2&Yv6Kh=moG*~Q~WBahmDwhA;*iK*W(KErSeF^G(KnsG9(_yBfsc-wk*iq zTGbWs%c^giUuj>$L#g8M>Q=L=so5jE@jy{tY$&dvYz0O^FH1y7&bW%7VU971)}mXA zzp0%3Lpt_5kB@wn@1GI!JNiiaMzmHe1v#xXaPQQ2BYx=#p}tr_A(&2a7t90=Fu6o- zx0gqtx^Mj8{yYlF6~NAlsq8RAw1i8b)Id#5?VflGz-=H>B1Y5XASMUeK!F_}`gtsg z2#`DlJ*BxDKOK0-F4rVFTBpkO+e`*97_;GuCt(MNF6}BcE8Zq{P=#L=J=QJ!p`Pji z30z8&Re9Di9>77r*tw=y+otm@nOl?Ypjq553r*;e)uVfvCJxiW7AON<|%+rq*MdQKyr zPA}xrdjDwuvZu|?)>GkSH#3o`YS$W|h`A?JyM8QDg+*Osz=e^lCEYe8KPe?d{m+0DZyNZ%t3h=R=5}pAV?rPtXf(_SQrzh zM>mx&sm#_G?Cai9Qs~~Td0Jo&9iyKD8Bur2mX0MvdBV)pBVRvw0vB51zE5JNHsI3tipCym<% zi34jP)@0A)CMgVkC_sJd^g4s2xg;Q|eh|0L)ak~X_K9_(e+Am-Bn>xcxt*^4q4krM z*IKhG9tCCJv)SYaGMySEQUtBo?^nmAjg2jJEnkVhDy*5Nhu&S-S*jCE$6{x=$#skMIToHwI?!AF$S(3bx8Ww?(p;!5!I@HNJ22YbwTT}BW zfB%z|!I69ofcN9iJv{h6MQa8YDphm_28AQy9?>GibR>#v+%APem}wY)SA2GUpPoG#65{9L-3jX)Mr(Dx>Ckd znaiW*PB+1KtTsCG?v1q{ho)RkZJv~obl-(H?V4rKI8=-jm?i3jUuEHvX7ueae`0j1 zC&FohQI!TgNJHC$$12BYlo=#4UK#>%8*VhodJ9stpACaq6TZUsiU0WteTAe&rNF%3 z`eF33=9G4Ftr_~=#5=@zy#-e-8l25;OZ0P$n!#^4CsBFp=(t()Dv|8E)zZ;{Qza(u zPw0t!^qR{Sw?AZHV}3A-Kz5-&MNjDp@tVxWm-FV&S1Ynvk*U!M_?S%c+1GObP$o)M zWgXQGZ9Y=WW?%d1Cw5z4)pw$;LJG;ta(^f-&rD%w)L%ppmN+Ihe1MM z|3n5E8#gCs^YI|V#j>BstK6AOV0nVpZP{)4bfwZ1plht%)%o)l`_-uCr@-EZF3crmdJAeN~1@#NH7%&kxqE zuisT%%!P;uxvxW|yu2=q^1F`l@>QMCYB5_T$Qn&g|G-0O&M(UPg_ECMiy86Ozly)K z+|C_28P2F7C-10(kVNz7Z17pz!@H!fI15s}>t|mFGx)e&7&F`J9x{urG9xH~SjS9aqG&#@dFN z#mIz}zl^>}%ywgZHnpSLqlUQ3hvkW&gwj;khN7X5mzMzZ)(tRWj7v?WEA8MAE&2st z&KcCGKdRu+L0*u;tX(TlJGVk!y*rDCi@b*Ti|tY=yMIEL5{J7ZF(}1o?xN+)YybUF z0K~T6C2caI#`g8yrO$Z((G5mX<|?A|=Oczl9-Sc4&;z&7`S8L-l>$jyH2r$p$iv$X zo6$u5axLzMOkQ0g71BXZE%lXv$#-psV;(qu*}&$7%uX;6X5ll|2}!~+VjW{GpRKzw zq#JcheSC+$aSdN%Dax%ULZ8>blhccs8)}{(a{oy_$6kmsqp#~bQ0r++OX|3Dg=>-8 zoxGI^L={8I(MJ$;^1V4Q;6M`PI5pM`ny`olw^EF_Pyjc;^AAXErg%2IY2F z#(vNgZ8y(zE?a)qNYkVH-Iyu(T_Y}X589V+?qpVzxLd)Gl0x?YmOnYNQIxbtYk|)| zmuQG!TkB1DcvB*R$Xa8E-ri)y&PiQ~Mjg}zB|{LDxqzUjS+IlqhiB1oU{SP>!Ry!t zA080V32Q_0RLf44v@$8*X58t{5S>wZL&NADz?LNAlB|Do!DwGJQY!7*48To(!czAX zi`i4UX^3mx6G3T(09up08J5%T&u)|5u7t2s7Sb7oTz*3q%Nl>$vOLtb?}figytXao zt&0sgv7+u+$p%x_)LxfAy0gS4@ZW^#&r@X#$AAoJ@1$$|PuTW1Vt~i`1h(@@o@w8| zKm&2@xBjfvqo^`6zc;+UQ3Hc^Xgs*5kx9g=|3n_(Y@hg|7+PeJMo0fn@X(59?RS?3$`)SLuBpW$S zZhy_rf$zyHIF@H!XaAaOrw*9wup%pJ%|sc#_l!~uf|Oy` zfmcW`ONW^dzHi9*uUqC{f_-@9O`oqr@oPH0pE;(yVo7bzC@D2z?H0oB(a+L~d&bGEx zdpKEr=dvMGNUvYq2mL>4>gumQzX}#7Pu5?=-wo_Es%*Z$-udX$0HTpy~dgOD`Bt%^l#g+k*{CywsJ-dSk@7L@C4AS)b(+9p`>zpo}HL3F^7^yn+ zb$qrsp)iO>onk?f0f`#hl} zpl^O^a>~Z)RX-N{ud8Qz5;Bxpa#R?lNZf>CX27^s6TU{*!Jr z3Lk)K@O{qP>VWtR=%pLAt6S%~i19t8G^D~?W%0WjqJELI0Cb0in#8}|fLck!%ZlT# z0tY~X<_FNusI!?35PCEk2lWkGTic;z78W`>k6-!8r=CLJRvx=wu1_t4mPmoZB50Z1 zpVhu(O6GPe<9l^+)Aa0&pEGM&-@a-f#E(GIcV4&o=3Sn?MZ)_Drvm2GT9dO@uF$VU zw-=d22zGM%4s@i?a^LJZO=@(g9!X?TU zCMv&n*}fzz=+oP1YH2hY9U#O^6Bfq!>?UOy;Ce+|*a_9DGrw0H$#k0DZ3?&xJ%)rb zq|G9Zj{5zpWc>iW%WSVKv89OnV}ttV0tsmZlR~-uP3n&|&xuQ_yAfkd;d~MK5*nW}L3+2yEi5gSuCoUhv2XMzuoBK?%o8KtPeqL4W;(kYXKhxd;UI zYKUFq7i(;+v?71p5+43^HZwaF8TnepyGUzoGEHD^CYiUnyKPB6M0aGwYS5qKIF- zn+{AQ#+lZQk8@tD*30s9cI+zdEqk5H_U?G?MS2q>v!Y=JoyhZ;^R8b(x+9uLpZJA^ z@6APSUcY&B3QUxjJ+?9)D`muh!uHsqiHO5k54hyrMn^yox9xhH0RVPt1>+XLX+!n< z(SH4UG*GhfIT_&z(*)g`5s{ISNI-tBCAR)BQnak=73~_i&!X$RZIKySjO{`_I!w!> zGfPX3wi?a5cki;?*WkY&jjgGKDfC#cI=XFi6T;e(x>pW;VFP6acwUWH;$iqqa*WL) zwHwkK8DbRaOH}rzS%SozHDLI~_->ZGF zKW{SqAjsSM++uFb74gB{)`8Wq;catJE)mM!k92!G3yby`*$_?lpE;puTd`9>n^gno z+&ipxKHBBppYJyv^!D~rAU|rZ&Y*eh0`kqH%{q>r_mLDd2i9im{k8Q+-uQuyBlky9 z7~A<;VnKH_e5b`mmq#j2TwGkmTiURdQ2DSK8u_PEv{D4!vWIAE)Htym%J9vrA%sfy zyTLJP;heObz3kimm(j7|%@MR=N5*=zR*@ZiE+7*G&EcSLTf}j#yXT9dmkWu4NEuV9 z(6rfA-+*PGbyWI0!c7%6-*p@2QR1tCl!_=G>yY)1#)Yy`6mPTI^owMo%iZ=ZlsZgj zv5EC>Y6$AxZr0!2dvQJpohO&yH@2CyjUJTPmB~fR@oRckR8%R^Y49(g)J>m^e~n2# z&|5OxN249XwhEDr>-W`)DjT0snotQG$lpZXeEO9rK`!LwYLveNuW%io+3&}NC@n&E z*u~G?(wjnaZ=bTgw%SaqpGZ0>LBH}o<0Mb)Nwgz=MUWgM$TAUyl7Aua+P<@+pDIqO z0iKrX>p($0?Mv=p2SQ zxYv$+vv4A#T2s#&*;~|`3kv8Hk(ZM?Ggh;qa*g=g88NC6oL;mPm8uz5x`ZVIyDtv~5Y z^`H>bNgZcN)-cP~9<6(RXi^yEFo!ZAp%U?en`=d0U`nxqje|qcK#oAc|LWB%ipy1U zPEjl(5#L)tysOYrR`!PrRX}4uIXO`-m#C0blKdutO1rlDNop4k9VJo1CQKn95_APi zaG_3$K+8(1c1wMkjqH^T>EP~wDV2eDoUJmo2pmV~5hV&!g6eJ^Qz_CjKFQ6csMZIa z#WcyVUU1XF?E=h;`Zr%|R)q+fj~u;x5$Mm|lO-vWDUcQ9*|L{>tEVn)yH-#2SK;Hc zV-%wm2E&HhyA>iy5?kIC(kk|+ILx0?d(bs7T$IrlGgb1IsxwVWf3X}IXPF|^DNic# zz9_L6CNMF8RBld?-Oi69vP@McQ=U~xQyscUvQZY0Y9AF|LBhfLN*I|}(;If)b zf7&;QuJR|~MZ1QqN9;j#QxJ8X)17iED7M}U*U}kDwo;mPc!A%hALi;pGp~=LMixiC zlc*UL*tz4K!G0LRuNMe(s_uX2Xuk}#ePwpq)5p;4E47MNj6n=bxFX|i`117^J}$Y< zvl|<`1 zJ+aSezhgQu&fr|E9(wwmd|5X$?=`^nOsw|WS<&ot6?6CSIo^1lFs+m(F(ctEp4PaT zqzwX%cOK~-+RX;0hsyG#FJHWnIK;%jJ;wVH)+q~T*7?GDm3)I!FzBE@2eE7uwB~jK zJMVY0Aw}zFCOxL1DYe&+?l%++^zlW%_U7wQp(K(dE_Y`!hVVA5%UihZmjt1eP1N2n zbBb<*XHge>G$IsQ?^_@8(j_4K4oaA)p1opc+f2j0-OYAHLMRCEO5?g+8iU=M`}dRl z_5nPvK5qFThb)hqQ%3{AfX)N90!O(Xe-ZW+t_Y|d4;lQ@VY%V73?9O11cm;=a@)_7 z)^A?JzkXr9;QD}kLCh==aL%Jp?g_(>MN6f%+hsiUvx3ePcCq2_1VYpT!QlQ`nOIs94sm{x%bXCrmZ@qoW_h!c zjlk>}U2}VPiTrSvxuNzj zdQaCSjXZMCj(RCPzkz9b&uioAeSzudVEkX>?nt=QxpmE;d?lIVG*K*#bx~zRQOP9t z-jwMFZPY?`+-liJ&A=BpP5Mt{R?aF})lOrmZ-Z`-)||R?dlkCdPc23gsx21IPJdLw z+m(~LjnEYx=~pS?6KT6MlGWx|h5kxNF%D17N`Z?A3P~ejt|R2K!s^tMlN$v3+-!Bu zz-*Y;WOx9SBsz4)KskwG&d`ab6)~7svUDW?tuA&9t>rL{5P+=XWM&Z*niMIfW@ZQ% zS8w<;W~7v=YHF}?pD3iTK5<0RAju^QZ^?cl9riKe&S;y?%s(2R12&y3xfLKoVcr({ zs;Yqy;o+q~FjM?JW*}(RZYPIxk@X%O8j>K!IFpWiI?a|V=0I=haIjiw0O~(DlcNAc zR-5!U=R&a(kMLD>?6O^t2Yc~{By?=roTi0(db~DD8LPRYvOxzyhvE5Vwucaj{HJ>g z+D2+?W${e~F`3blq17P=@FCEJeZlhs@}sG)r@Q0h&-0GliVA96zozhc*7z!p>*-jz zS2fZyF@LTvn6Y3Zr`Ts&O3z5Jb(^gtU5*Y5BTPyw_2)w=v{Df9o{$KUh03%{@!WQp zM;C^|R1NLI1r}AjAM*W)DDN-%FDo&j=!RP#i|9yhPZF%JuPQMKg0V2^>XJCu@(9dK zq*?H@u=3s;JN>AfLuoFMY#)joUnyXzXN7lWXP7I!VSuWOeLhxWeF(2K$8=xh3wPHh}tKg-8cLh2@FSNM+4mNNUg(zOotB7|>oCb3AJys36xr=9`n zQvfgY!Z&H^WP>O1FA~||X%a|2vl*KGq69V*l-Ta4Z&bIwR!wcY?xaW(V^E%R@iSvQ z#Lo%M9NvZ$J}Iy;il&9clQU1b4PTe+_}tv=4R~LPiHQx1`j?DP7uqp-EYN@W?ax#~ zUBq<|3j-a^5GSHI61m_oKiWHT>9sBrR$MH^ey^WI)0kgVIi9-Rcjsxw;AhrHpgvKY zfo5a5Y`_Y$0_r7TfKO!XB;Uv&pRrTX`_D+ddWBQlqfki_D9Pjq`UCJpzR_?K@z^bZ zHk5IQqXS?wBF)>~JO&y|jAc?j^Lw6JKx>^wdQGkb}EGB*d@}Aa#7V}s0-~h9(t7cqR?NJ z>+96)YaHCfvpQLZD4*LZ=_4^v5XY$p>xDr|Y1k4z>98jODo z6AR$_E0HJK^EP+vIRac$LN3)vX7#JRg5UbZ)xG7Bh@o_QbSLo@{*`pP<6dh`&t#!p z=B?0e*l0=EM322-^OG;qe)TI$nu}x0rU>?JI!DIOBo#CazH+unmqIM{vZgf>F~>;f zwYu}4g_*AU|ApI#DnW34uxOEHCaiufb&u&%U|X0@l9lXJL#lyC#DOba1;LD{Q)vXl ztRzWGJb)s2eh;Ts_kEXc$>(CBsb=u7nJ!`S$ImK$R-vYt>8rr=z7`SlAkba+2OR$e z3By%zCUti4vWKyDDJwzfo2C2h9Zow}6ex7w*?kS6)PR^qSc_|OcnNf|%1hDCG3jm6 zE5-3@3zMEc7O7VF;gLLp5Ba0g7as{Kct?A<5+8>%`1nXd`OY!A z{!bE$bTc5mg!v(${S&6bD}Lm+oDHAU|AXJ+kIn+j(21bk zKL_nbJamSWxmA4&@jK=4x5fal&81|7^;`nsBf?hy74mY$B~_m0y=<9t8)dctY$v)y zoJZK7ulu7Px(h;0uzBT!61am4q&Qh~qwP#1z}#XLq5mGLOj(o)Lw7xCA@Z*TT3q7o zG+Icn#|rJ=*ZFUxtPxByJKj0;@AT&nrw9ClKP%@~C>gPTLTv_PFaW~K`0#I#5RCv_ zn;b_HUWC7A@MoYvW^i$SZY+@hhiCNH$o^w!08@-QX;=O;V5e;MR;V)4+%whF1xwN- z3mT;2ti79`5vY$>1P%%SjjX)kf`86WvrRAJh-JWA@v^1&<}`X!C= z$~8@)fc3_;0uCk|n|aKUAIID-e0cC)X%4Ai+V)`Dhr(@w{J$?sI~jbKBt>%H#eE0C zyNP&0+*un}t&GflpPTm$Xq7=5lP!_8nv|t*jM=Fb(we*vq8GjXX5#DnD>S!wI>yxv z!n|rFu@U)eVXyH455oxyezcBnc`G=x=|+NS{GjXM>du)XZ{k#rsw>lnq60|QMIIN7 zr7S z<72OOHcZw43tYF7`!t7S?w|Jj^(kFC4kkxLg_5 zb@U(O4z`|2(|`0gUcm(m%fA9=h0wsz$J4{%&;9Jc5QX?&@{uPdTw8nQa68l4e7= zSt=E)MX}_Y+%n8Bq7NsvY*zzwK>0>5>%hQ8rd0ZV)R`U8O5Xo4l{g+d&%;}xK!J|I zzA~3LoPP6bRqd_GVw_{RwgOMgi!kr~+Gdn|%}GiojB*<`YqwLro@|{7KmKs1 zCold~&ZKkQC8OSBD2QrrCa8bdf{WgF#7w4UockGrbYa5Rp@=ezFKdSrd1^gTX5}Ij zBG28*7F}y6+4*|j?uPC_4b7FFWt=DW5k?Sm@`#m4;oGL7+5d9cx_XcO?7R0xYprbz}7ShYD(uygxh;r4%JJ7dT2--S%e$B7EG%n{T#H5Nj^d^t8CX3{=wqJ8u<%EAH8GGW;P8Z;FFd!wWz?a>1nflL1q}L|byj0`> z+BNvfpL`OD;kEd1q9FloM>K^S30mk( z8ZPV2MKqME3_G0Nycc<)J^YlOKbFMHWLRu^1Ld!XGU@F`s<|(Z=FOU~xH5#Q5fRF> zf}{S;DkUP)Kj$aG^tK_HKA%YHiyo9%>eqGjeM$m%=uOUrV3?j3g{Jwn;{|>iU-3AS zaps=vh^c;MB>5=@wn^tVI#h$swy&m7-$0d3Nzh1$6JqC)q-S##ZOnMfeIij8coSBQ zlb2*JSrQ9>WL%|Ctoj@(gN!|*CxtyNS3|nkG+YbDb0|W&5dXUcW^t^EWbrsEw^-eb zeR@y6G60N{T6{&WyNlMUBTi{u%n}HOq|=**R#P+ZGYHE&^6*ftQi_}hJxAE2Vs3LG zV8k^=>3fz#mi&sv-J1j1IRC=+$tL=~N-9hTi){K-uS=}bzttzqD;`=sw&1kV6Cy1$ zPwkTew|M0M9atQUdrCGgl|MtnB1VxZ&vaxXWp0y5>cX`Oq$M;ur?zq{`Z~~UB)=%> z(B1r!Q}hmbXB-W6bxkOl=kPUJn7L*sy+MWcN8TKjP{z>EiqB0qtD=p76bUwWwog9p z)L~pHA0j-mitY`mxv|cJnOX4!L(2Eb4X6FhI-?!1b6H8MJ7|8Qy{r_-@i8Fu1y4b8 zmbc5A`6_hp-z>+|Z^#H(KvmBX>AngT&-uB|qIDp$AIQzSANHq;<$s8I=zfifFCJo$S(StjWA%2=1nDGXc z?oc)6NC%HKDPSis-NFCyM}UV|QAE)DEIITK5$Nw=Cz}O4)=UuO5Hw6zWX9H=I`Tx%3q~ssY)^P1?}`>0E=hx zA{$yrpU1}EAxMbmTb8yEh>WJk2*E)YhS&78(W#2#Uja>*4A_e=KQKfm{9~Hg?Jn2` zWX)wCcK>x^?T6?FWJJPS5tNVd8kitbFa!%05rWHpJUBqR3)-Q~W%&#u)GBuP%%3x7 z{RUIYy_Kl18u^BbLS>-W!hux%}njX)jL@yq^5($omuPo@zj-N&_9uk$qMdt!rQP z@nsU===pe1SWVGLk;RDiY3#x~4m6a*VuOo6W394~dBX~cg!o=&JtuhrL(5tPU6umd z(ILuPm5C{+^(V@yfj`|+@2NQ({`}XiF@S?9a|mBWi;isiXP6Dn>j}7KL`r(D3V*_q z-&aV9>*lqr`eYtaAJM zQRAXrn;)9nfUYuG0<>fg^GLtA!4;OM?))x1z&Og(nw+L6An3v=rhSCr5se zA%|2B(-MpzCFy=fhUFT=6N0&x`$h{i0*4s?&z|$R(q4j$35CE#_Mm@jU7(BHCxDmt ze|G|;AdonT7F8+!@0%dN=@JDi6z>BS%KLw952A3aXedGSH-DAt|GV5-kpRyiwBz|2 z+CP#?uuc5mGC*{ga1+sfmpU;{;Z}r<_L3E!)`aqeAz*7?6awQA6R7{af=Dv{(b3UB z5NUSrdHF)t$WayB_k0F!yah zz^gLCa2XWlmR#Rz<8>*W`flk~&I=mXaZ`&T1HedthNeJdFVI#YOE`+yuu!E~O*7o!(M&WsA)&jkZ|6;;!4Qz$2L#pHx;k?c zlT&lGQZ(3K^$sxp>ovW5=4m#}G4ne$O+F3qjUu-OPOhcBn`iiyQ#*iqx1dMrX~`yV zgo@~HVf{RBV%_I@%5i`nJ1xh5U|-w?J;tb^>xYwjb7!=&$bx6%z}5wi3qLmwmu7}t z^}?%fYSz{8$d?)ayBsAL-U^1$FN2ygF-mBU(be$~OL}_x`z9N1ZDV7~DFb(sm_8Hs z1|8;)?1dBINr24(m;{<4rh^GvS$@KRus2dcGVki@iXiiSaxz$9*o>q0*mJZ^9EU_a zT~YYzV|_hd3%vChQqCzT9ZG93Xq25^L9%oPvy@B%L(cH*pBFc6y3^Bsqgz9*X@_hG zZxCgB)=UDgXXl?;V5>AksVGex>CemEZEGh=f|rer{G@S5?}Rg%a_DVu3cU9 zmzJJdxQNxDzqjuiXso8KQKN_pld|6vn*YA(ewJC>G^CY8`uTo@$@l~V(%url1c~wi zFxARK)R!$7?<6%Tu`hP^a5Aa?vG}Ur%G0C+728_dd9-=7LttF>C?dGg0^DO7fUz|2 zDFN-KTx+w=qe98?@v5(0owq}w0xN1FKBq^kpGW$tk~bg-KbncF!Rh;)sS9Ee65ar_ zL*Oa<5aV}CX+)wY1^lYB6@yw<445L{tTD(opH%7{~=ozbSJad|QcW6ES!hnp`b(3*#&Ic{gkEpWd+<#?76 zjf$$al$q7cDRR{%kr?J|j9D{obya2g%c*!~>xA-bL^h__;){Xa&yG(hLBk(-_kw*K z9+R9uPu{nXIZUxYBs(D?C^8f}>~&sBZ}>6sw%4P76&m_MP-2k9%|{ap zuoj*cirmqO6U&A5$I?PP3hSl7M4W~pT>(Z)Hk)TrNl6nB)g0qPh$+HBK)N~K>pCWO zTUd2%V#$Q`1jb6BsmOo;i~EG{o;+>O8zr@KCBfa-%U!KXgp$wdq0xtAL&DPP<xuFh-;#i8E0e>hhF7c z$4m>gtZr-tyI9cK1h}rpyVTFP$XH?~*$*j7^A5lKPP5GnGVz^pymUBXSlq^G_?r#4 zfBYa@AnY*d-^<2!u72Trrlr^>OK~!a+n`HfBwW?&#M{e zE3_uj*BBQm@Z9T={~LdXyn^t5NjppaogB@GwFm)FsL9%Lv_NJF84;QwM{Pt>hT5&6 zqXQ_o!Znc72)QI-2qbpofiIPIUdYOd&Z5~K5~JoY*kJFz=2cO9h!t^^qL6!^Vie)^ zEn6s;vY^n2VHZnX@=f&f!XoY5N~O^5n9jrN6(h1;D04}{?+>ExExe$`YDGGagWcG- zfftpBu|;pOiu8Z)pwfyJh^Wh7F)qxZ`jU0`VXw)Fdm{uNl4GvI4z2@e>#r2yF=&6x zlYGoBKa@D&)BOlQ;E?UweCtm1KdT)JuMF~ml<#wE@%DKo0R;GaE~Ow@CTg Bhi?D? literal 0 HcmV?d00001 diff --git a/public/js/ff/index.js b/public/js/ff/index.js index ba6c9993e1..1cd119c383 100644 --- a/public/js/ff/index.js +++ b/public/js/ff/index.js @@ -8,7 +8,7 @@ * See the LICENSE file for details. */ -/** global: Tour, showTour, accountFrontpageUri, billCount, accountExpenseUri, accountRevenueUri */ +/** global: Tour, showTour, accountFrontpageUri, token, billCount, accountExpenseUri, accountRevenueUri */ $(function () { "use strict"; @@ -34,7 +34,7 @@ $(function () { function endTheTour() { "use strict"; - $.post('json/end-tour'); + $.post('json/end-tour', {_token: token}); } diff --git a/resources/views/javascript/variables.twig b/resources/views/javascript/variables.twig index 8d188af209..5fe2a12f60 100644 --- a/resources/views/javascript/variables.twig +++ b/resources/views/javascript/variables.twig @@ -26,4 +26,5 @@ var frac_digits = {{ localeconv.frac_digits }}; var noDataForChart = '{{ trans('firefly.no_data_for_chart')|escape }}'; var showFullList = '{{ trans('firefly.show_full_list') }}'; var showOnlyTop = '{{ trans('firefly.show_only_top',{number:listLength}) }}'; -var accountingConfig = {{ accounting|json_encode|raw }}; \ No newline at end of file +var accountingConfig = {{ accounting|json_encode|raw }}; +var token = '{{ csrf_token() }}'; \ No newline at end of file From 3e510bd3f60a9813c1bae0f3da03b8778c916cbc Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 5 Feb 2017 08:26:54 +0100 Subject: [PATCH 029/276] This fixes #549 --- app/Http/Controllers/AccountController.php | 28 ++++++--------- app/Http/Controllers/Admin/UserController.php | 5 ++- app/Http/Controllers/AttachmentController.php | 9 +++-- app/Http/Controllers/BillController.php | 22 ++++-------- app/Http/Controllers/BudgetController.php | 34 ++++++------------ app/Http/Controllers/CategoryController.php | 22 ++++-------- app/Http/Controllers/Controller.php | 36 ++++++++++++++++++- app/Http/Controllers/CurrencyController.php | 20 ++++------- app/Http/Controllers/PiggyBankController.php | 28 ++++----------- app/Http/Controllers/RuleController.php | 17 ++++----- app/Http/Controllers/RuleGroupController.php | 15 ++++---- app/Http/Controllers/TagController.php | 14 ++++---- .../Transaction/MassController.php | 9 +++-- .../Transaction/SingleController.php | 21 ++++------- .../Transaction/SplitController.php | 8 ++--- 15 files changed, 118 insertions(+), 170 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index b3b007cb9e..e68ee7f8bd 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -34,7 +34,6 @@ use Navigation; use Preferences; use Session; use Steam; -use URL; use View; /** @@ -86,7 +85,7 @@ class AccountController extends Controller // put previous url in session if not redirect from store (not "create another"). if (session('accounts.create.fromStore') !== true) { - Session::put('accounts.create.url', URL::previous()); + $this->rememberPreviousUri('accounts.create.uri'); } Session::forget('accounts.create.fromStore'); Session::flash('gaEventCategory', 'accounts'); @@ -110,7 +109,7 @@ class AccountController extends Controller unset($accountList[$account->id]); // put previous url in session - Session::put('accounts.delete.url', URL::previous()); + $this->rememberPreviousUri('accounts.delete.uri'); Session::flash('gaEventCategory', 'accounts'); Session::flash('gaEventAction', 'delete-' . $typeName); @@ -126,24 +125,17 @@ class AccountController extends Controller */ public function destroy(Request $request, ARI $repository, Account $account) { - $type = $account->accountType->type; - $typeName = config('firefly.shortNamesByFullName.' . $type); - $name = $account->name; - $accountId = $account->id; - $moveTo = $repository->find(intval($request->get('move_account_before_delete'))); + $type = $account->accountType->type; + $typeName = config('firefly.shortNamesByFullName.' . $type); + $name = $account->name; + $moveTo = $repository->find(intval($request->get('move_account_before_delete'))); $repository->destroy($account, $moveTo); Session::flash('success', strval(trans('firefly.' . $typeName . '_deleted', ['name' => $name]))); Preferences::mark(); - $uri = session('accounts.delete.url'); - if (!(strpos($uri, sprintf('accounts/show/%s', $accountId)) === false)) { - // uri would point back to account - $uri = route('accounts.index', [$typeName]); - } - - return redirect($uri); + return redirect($this->getPreviousUri('accounts.delete.uri')); } /** @@ -168,7 +160,7 @@ class AccountController extends Controller // put previous url in session if not redirect from store (not "return_to_edit"). if (session('accounts.edit.fromUpdate') !== true) { - Session::put('accounts.edit.url', URL::previous()); + $this->rememberPreviousUri('accounts.edit.uri'); } Session::forget('accounts.edit.fromUpdate'); @@ -360,7 +352,7 @@ class AccountController extends Controller } // redirect to previous URL. - return redirect(session('accounts.create.url')); + return redirect($this->getPreviousUri('accounts.create.uri')); } /** @@ -386,7 +378,7 @@ class AccountController extends Controller } // redirect to previous URL. - return redirect(session('accounts.edit.url')); + return redirect($this->getPreviousUri('accounts.edit.uri')); } diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 9fcb8b9a99..818c12c2f6 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -20,7 +20,6 @@ use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\User; use Preferences; use Session; -use URL; use View; /** @@ -57,7 +56,7 @@ class UserController extends Controller { // put previous url in session if not redirect from store (not "return_to_edit"). if (session('users.edit.fromUpdate') !== true) { - Session::put('users.edit.url', URL::previous()); + $this->rememberPreviousUri('users.edit.uri'); } Session::forget('users.edit.fromUpdate'); @@ -156,7 +155,7 @@ class UserController extends Controller } // redirect to previous URL. - return redirect(session('users.edit.url')); + return redirect($this->getPreviousUri('users.edit.uri')); } diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php index 2b154defea..a6532309f1 100644 --- a/app/Http/Controllers/AttachmentController.php +++ b/app/Http/Controllers/AttachmentController.php @@ -22,7 +22,6 @@ use Illuminate\Http\Response as LaravelResponse; use Preferences; use Response; use Session; -use URL; use View; /** @@ -63,7 +62,7 @@ class AttachmentController extends Controller $subTitle = trans('firefly.delete_attachment', ['name' => $attachment->filename]); // put previous url in session - Session::put('attachments.delete.url', URL::previous()); + $this->rememberPreviousUri('attachments.delete.uri'); Session::flash('gaEventCategory', 'attachments'); Session::flash('gaEventAction', 'delete-attachment'); @@ -85,7 +84,7 @@ class AttachmentController extends Controller Session::flash('success', strval(trans('firefly.attachment_deleted', ['name' => $name]))); Preferences::mark(); - return redirect(session('attachments.delete.url')); + return redirect($this->getPreviousUri('attachments.delete.uri')); } /** @@ -131,7 +130,7 @@ class AttachmentController extends Controller // put previous url in session if not redirect from store (not "return_to_edit"). if (session('attachments.edit.fromUpdate') !== true) { - Session::put('attachments.edit.url', URL::previous()); + $this->rememberPreviousUri('attachments.edit.uri'); } Session::forget('attachments.edit.fromUpdate'); @@ -181,7 +180,7 @@ class AttachmentController extends Controller } // redirect to previous URL. - return redirect(session('attachments.edit.url')); + return redirect($this->getPreviousUri('attachments.edit.uri')); } diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index 0642dd260b..916cc7c406 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -66,7 +66,7 @@ class BillController extends Controller // put previous url in session if not redirect from store (not "create another"). if (session('bills.create.fromStore') !== true) { - Session::put('bills.create.url', URL::previous()); + $this->rememberPreviousUri('bills.create.uri'); } Session::forget('bills.create.fromStore'); Session::flash('gaEventCategory', 'bills'); @@ -83,7 +83,7 @@ class BillController extends Controller public function delete(Bill $bill) { // put previous url in session - Session::put('bills.delete.url', URL::previous()); + $this->rememberPreviousUri('bills.delete.uri'); Session::flash('gaEventCategory', 'bills'); Session::flash('gaEventAction', 'delete'); $subTitle = trans('firefly.delete_bill', ['name' => $bill->name]); @@ -99,20 +99,13 @@ class BillController extends Controller */ public function destroy(BillRepositoryInterface $repository, Bill $bill) { - $name = $bill->name; - $billId = $bill->id; + $name = $bill->name; $repository->destroy($bill); Session::flash('success', strval(trans('firefly.deleted_bill', ['name' => $name]))); Preferences::mark(); - $uri = session('bills.delete.url'); - if (!(strpos($uri, sprintf('bills/show/%s', $billId)) === false)) { - // uri would point back to bill - $uri = route('bills.index'); - } - - return redirect($uri); + return redirect($this->getPreviousUri('bills.delete.uri')); } /** @@ -130,7 +123,7 @@ class BillController extends Controller // put previous url in session if not redirect from store (not "return_to_edit"). if (session('bills.edit.fromUpdate') !== true) { - Session::put('bills.edit.url', URL::previous()); + $this->rememberPreviousUri('bills.edit.uri'); } Session::forget('bills.edit.fromUpdate'); Session::flash('gaEventCategory', 'bills'); @@ -249,7 +242,7 @@ class BillController extends Controller } // redirect to previous URL. - return redirect(session('bills.create.url')); + return redirect($this->getPreviousUri('bills.create.uri')); } @@ -275,8 +268,7 @@ class BillController extends Controller return redirect(route('bills.edit', [$bill->id]))->withInput(['return_to_edit' => 1]); } - // redirect to previous URL. - return redirect(session('bills.edit.url')); + return redirect($this->getPreviousUri('bills.edit.uri')); } diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 0d8ce65937..1f2d510dcb 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -30,7 +30,6 @@ use Illuminate\Support\Collection; use Preferences; use Response; use Session; -use URL; use View; /** @@ -94,7 +93,7 @@ class BudgetController extends Controller { // put previous url in session if not redirect from store (not "create another"). if (session('budgets.create.fromStore') !== true) { - Session::put('budgets.create.url', URL::previous()); + $this->rememberPreviousUri('budgets.create.uri'); } Session::forget('budgets.create.fromStore'); Session::flash('gaEventCategory', 'budgets'); @@ -114,7 +113,7 @@ class BudgetController extends Controller $subTitle = trans('firefly.delete_budget', ['name' => $budget->name]); // put previous url in session - Session::put('budgets.delete.url', URL::previous()); + $this->rememberPreviousUri('budgets.delete.uri'); Session::flash('gaEventCategory', 'budgets'); Session::flash('gaEventAction', 'delete'); @@ -129,21 +128,12 @@ class BudgetController extends Controller public function destroy(Budget $budget) { - $name = $budget->name; - $budgetId = $budget->id; + $name = $budget->name; $this->repository->destroy($budget); - - Session::flash('success', strval(trans('firefly.deleted_budget', ['name' => e($name)]))); Preferences::mark(); - $uri = session('budgets.delete.url'); - if (!(strpos($uri, sprintf('budgets/show/%s', $budgetId)) === false)) { - // uri would point back to budget - $uri = route('budgets.index'); - } - - return redirect($uri); + return redirect($this->getPreviousUri('budgets.delete.uri')); } /** @@ -157,7 +147,7 @@ class BudgetController extends Controller // put previous url in session if not redirect from store (not "return_to_edit"). if (session('budgets.edit.fromUpdate') !== true) { - Session::put('budgets.edit.url', URL::previous()); + $this->rememberPreviousUri('budgets.edit.uri'); } Session::forget('budgets.edit.fromUpdate'); Session::flash('gaEventCategory', 'budgets'); @@ -278,9 +268,9 @@ class BudgetController extends Controller throw new FireflyException('This budget limit is not part of this budget.'); } - $page = intval($request->get('page')) == 0 ? 1 : intval($request->get('page')); - $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); - $subTitle = trans( + $page = intval($request->get('page')) == 0 ? 1 : intval($request->get('page')); + $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); + $subTitle = trans( 'firefly.budget_in_period', [ 'name' => $budget->name, 'start' => $budgetLimit->start_date->formatLocalized($this->monthAndDayFormat), @@ -325,9 +315,7 @@ class BudgetController extends Controller return redirect(route('budgets.create'))->withInput(); } - // redirect to previous URL. - return redirect(session('budgets.create.url')); - + return redirect($this->getPreviousUri('budgets.create.uri')); } /** @@ -351,9 +339,7 @@ class BudgetController extends Controller return redirect(route('budgets.edit', [$budget->id]))->withInput(['return_to_edit' => 1]); } - // redirect to previous URL. - return redirect(session('budgets.edit.url')); - + return redirect($this->getPreviousUri('budgets.edit.uri')); } /** diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 2a52505818..e74786199c 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -26,7 +26,6 @@ use Illuminate\Support\Collection; use Navigation; use Preferences; use Session; -use URL; use View; /** @@ -61,7 +60,7 @@ class CategoryController extends Controller public function create() { if (session('categories.create.fromStore') !== true) { - Session::put('categories.create.url', URL::previous()); + $this->rememberPreviousUri('categories.create.uri'); } Session::forget('categories.create.fromStore'); Session::flash('gaEventCategory', 'categories'); @@ -81,7 +80,7 @@ class CategoryController extends Controller $subTitle = trans('firefly.delete_category', ['name' => $category->name]); // put previous url in session - Session::put('categories.delete.url', URL::previous()); + $this->rememberPreviousUri('categories.delete.uri'); Session::flash('gaEventCategory', 'categories'); Session::flash('gaEventAction', 'delete'); @@ -98,20 +97,13 @@ class CategoryController extends Controller public function destroy(CategoryRepositoryInterface $repository, Category $category) { - $name = $category->name; - $categoryId = $category->id; + $name = $category->name; $repository->destroy($category); Session::flash('success', strval(trans('firefly.deleted_category', ['name' => e($name)]))); Preferences::mark(); - $uri = session('categories.delete.url'); - if (!(strpos($uri, sprintf('categories/show/%s', $categoryId)) === false)) { - // uri would point back to category - $uri = route('categories.index'); - } - - return redirect($uri); + return redirect($this->getPreviousUri('categories.delete.uri')); } /** @@ -125,7 +117,7 @@ class CategoryController extends Controller // put previous url in session if not redirect from store (not "return_to_edit"). if (session('categories.edit.fromUpdate') !== true) { - Session::put('categories.edit.url', URL::previous()); + $this->rememberPreviousUri('categories.edit.uri'); } Session::forget('categories.edit.fromUpdate'); Session::flash('gaEventCategory', 'categories'); @@ -311,9 +303,7 @@ class CategoryController extends Controller return redirect(route('categories.edit', [$category->id])); } - // redirect to previous URL. - return redirect(session('categories.edit.url')); - + return redirect($this->getPreviousUri('categories.edit.uri')); } /** diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 0904e4bbbc..d2233d75fb 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -23,6 +23,7 @@ use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Routing\Controller as BaseController; use Session; +use URL; use View; /** @@ -56,7 +57,6 @@ class Controller extends BaseController View::share('DEMO_PASSWORD', env('DEMO_PASSWORD', '')); // translations: - $this->middleware( function ($request, $next) { $this->monthFormat = (string)trans('config.month'); @@ -69,6 +69,32 @@ class Controller extends BaseController } + /** + * Functionality: + * + * - If the $identifier contains the word "delete" then a remembered uri with the text "/show/" in it will not be returned but instead the index (/) + * will be returned. + * - If the remembered uri contains "javascript/" the remembered uri will not be returned but instead the index (/) will be returned. + * + * @param string $identifier + * + * @return string + */ + protected function getPreviousUri(string $identifier): string + { + $uri = strval(session($identifier)); + // 1 (see above): + if (!(strpos($identifier, 'delete') === false) && !(strpos($uri, '/show/') === false)) { + $uri = route('index'); + } + + // 2 (see above) + if (!(strpos($uri, 'javascript') === false)) { + $uri = route('index'); + } + + return $uri; + } /** * @param TransactionJournal $journal @@ -102,4 +128,12 @@ class Controller extends BaseController return redirect(route('index')); } + /** + * @param string $identifier + */ + protected function rememberPreviousUri(string $identifier) + { + Session::put($identifier, URL::previous()); + } + } diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index 2b01c3043c..01cb6abd3e 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -20,7 +20,6 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use Log; use Preferences; use Session; -use URL; use View; /** @@ -60,7 +59,7 @@ class CurrencyController extends Controller // put previous url in session if not redirect from store (not "create another"). if (session('currencies.create.fromStore') !== true) { - Session::put('currencies.create.url', URL::previous()); + $this->rememberPreviousUri('currencies.create.uri'); } Session::forget('currencies.create.fromStore'); Session::flash('gaEventCategory', 'currency'); @@ -105,7 +104,7 @@ class CurrencyController extends Controller // put previous url in session - Session::put('currencies.delete.url', URL::previous()); + $this->rememberPreviousUri('currencies.delete.uri'); Session::flash('gaEventCategory', 'currency'); Session::flash('gaEventAction', 'delete'); $subTitle = trans('form.delete_currency', ['name' => $currency->name]); @@ -131,7 +130,7 @@ class CurrencyController extends Controller $repository->destroy($currency); Session::flash('success', trans('firefly.deleted_currency', ['name' => $currency->name])); - return redirect(session('currencies.delete.url')); + return redirect($this->getPreviousUri('currencies.delete.uri')); } /** @@ -147,7 +146,7 @@ class CurrencyController extends Controller // put previous url in session if not redirect from store (not "return_to_edit"). if (session('currencies.edit.fromUpdate') !== true) { - Session::put('currencies.edit.url', URL::previous()); + $this->rememberPreviousUri('currencies.edit.uri'); } Session::forget('currencies.edit.fromUpdate'); Session::flash('gaEventCategory', 'currency'); @@ -188,7 +187,7 @@ class CurrencyController extends Controller if (!auth()->user()->hasRole('owner')) { Log::error('User ' . auth()->user()->id . ' is not admin, but tried to store a currency.'); - return redirect(session('currencies.create.url')); + return redirect($this->getPreviousUri('currencies.create.uri')); } $data = $request->getCurrencyData(); @@ -201,10 +200,7 @@ class CurrencyController extends Controller return redirect(route('currencies.create'))->withInput(); } - // redirect to previous URL. - return redirect(session('currencies.create.url')); - - + return redirect($this->getPreviousUri('currencies.create.uri')); } /** @@ -230,8 +226,6 @@ class CurrencyController extends Controller return redirect(route('currencies.edit', [$currency->id])); } - // redirect to previous URL. - return redirect(session('currencies.edit.url')); - + return redirect($this->getPreviousUri('currencies.edit.uri')); } } diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 47357c5bc0..b74905c682 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -27,7 +27,6 @@ use Preferences; use Response; use Session; use Steam; -use URL; use View; /** @@ -116,7 +115,7 @@ class PiggyBankController extends Controller // put previous url in session if not redirect from store (not "create another"). if (session('piggy-banks.create.fromStore') !== true) { - Session::put('piggy-banks.create.url', URL::previous()); + $this->rememberPreviousUri('piggy-banks.create.uri'); } Session::forget('piggy-banks.create.fromStore'); Session::flash('gaEventCategory', 'piggy-banks'); @@ -135,7 +134,7 @@ class PiggyBankController extends Controller $subTitle = trans('firefly.delete_piggy_bank', ['name' => $piggyBank->name]); // put previous url in session - Session::put('piggy-banks.delete.url', URL::previous()); + $this->rememberPreviousUri('piggy-banks.delete.uri'); Session::flash('gaEventCategory', 'piggy-banks'); Session::flash('gaEventAction', 'delete'); @@ -152,16 +151,9 @@ class PiggyBankController extends Controller { Session::flash('success', strval(trans('firefly.deleted_piggy_bank', ['name' => e($piggyBank->name)]))); Preferences::mark(); - $piggyBankId = $piggyBank->id; $repository->destroy($piggyBank); - $uri = session('piggy-banks.delete.url'); - if (!(strpos($uri, sprintf('piggy-banks/show/%s', $piggyBankId)) === false)) { - // uri would point back to piggy bank - $uri = route('piggy-banks.index'); - } - - return redirect($uri); + return redirect($this->getPreviousUri('piggy-banks.delete.uri')); } /** @@ -197,7 +189,7 @@ class PiggyBankController extends Controller // put previous url in session if not redirect from store (not "return_to_edit"). if (session('piggy-banks.edit.fromUpdate') !== true) { - Session::put('piggy-banks.edit.url', URL::previous()); + $this->rememberPreviousUri('piggy-banks.edit.uri'); } Session::forget('piggy-banks.edit.fromUpdate'); @@ -404,9 +396,7 @@ class PiggyBankController extends Controller return redirect(route('piggy-banks.create'))->withInput(); } - - // redirect to previous URL. - return redirect(session('piggy-banks.create.url')); + return redirect($this->getPreviousUri('piggy-banks.edit.uri')); } /** @@ -430,12 +420,6 @@ class PiggyBankController extends Controller return redirect(route('piggy-banks.edit', [$piggyBank->id])); } - - // redirect to previous URL. - return redirect(session('piggy-banks.edit.url')); - - + return redirect($this->getPreviousUri('piggy-banks.edit.uri')); } - - } diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index 8e0e466933..2eee1da8a0 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -26,7 +26,6 @@ use Illuminate\Http\Request; use Preferences; use Response; use Session; -use URL; use View; /** @@ -88,7 +87,7 @@ class RuleController extends Controller // put previous url in session if not redirect from store (not "create another"). if (session('rules.create.fromStore') !== true) { - Session::put('rules.create.url', URL::previous()); + $this->rememberPreviousUri('rules.create.uri'); } Session::forget('rules.create.fromStore'); Session::flash('gaEventCategory', 'rules'); @@ -111,7 +110,7 @@ class RuleController extends Controller $subTitle = trans('firefly.delete_rule', ['title' => $rule->title]); // put previous url in session - Session::put('rules.delete.url', URL::previous()); + $this->rememberPreviousUri('rules.delete.uri'); Session::flash('gaEventCategory', 'rules'); Session::flash('gaEventAction', 'delete-rule'); @@ -135,8 +134,7 @@ class RuleController extends Controller Session::flash('success', trans('firefly.deleted_rule', ['title' => $title])); Preferences::mark(); - - return redirect(session('rules.delete.url')); + return redirect($this->getPreviousUri('rules.delete.uri')); } /** @@ -181,7 +179,7 @@ class RuleController extends Controller // put previous url in session if not redirect from store (not "return_to_edit"). if (session('rules.edit.fromUpdate') !== true) { - Session::put('rules.edit.url', URL::previous()); + $this->rememberPreviousUri('rules.edit.uri'); } Session::forget('rules.edit.fromUpdate'); Session::flash('gaEventCategory', 'rules'); @@ -263,9 +261,7 @@ class RuleController extends Controller return redirect(route('rules.create', [$ruleGroup]))->withInput(); } - // redirect to previous URL. - return redirect(session('rules.create.url')); - + return redirect($this->getPreviousUri('rules.create.uri')); } /** @@ -350,8 +346,7 @@ class RuleController extends Controller return redirect(route('rules.edit', [$rule->id]))->withInput(['return_to_edit' => 1]); } - // redirect to previous URL. - return redirect(session('rules.edit.url')); + return redirect($this->getPreviousUri('rules.edit.uri')); } private function createDefaultRule() diff --git a/app/Http/Controllers/RuleGroupController.php b/app/Http/Controllers/RuleGroupController.php index ee0cb84c26..e0bc8b7476 100644 --- a/app/Http/Controllers/RuleGroupController.php +++ b/app/Http/Controllers/RuleGroupController.php @@ -25,7 +25,6 @@ use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use Illuminate\Http\Request; use Preferences; use Session; -use URL; use View; /** @@ -63,7 +62,7 @@ class RuleGroupController extends Controller // put previous url in session if not redirect from store (not "create another"). if (session('rule-groups.create.fromStore') !== true) { - Session::put('rule-groups.create.url', URL::previous()); + $this->rememberPreviousUri('rule-groups.create.uri'); } Session::forget('rule-groups.create.fromStore'); Session::flash('gaEventCategory', 'rules'); @@ -86,7 +85,7 @@ class RuleGroupController extends Controller unset($ruleGroupList[$ruleGroup->id]); // put previous url in session - Session::put('rule-groups.delete.url', URL::previous()); + $this->rememberPreviousUri('rule-groups.delete.uri'); Session::flash('gaEventCategory', 'rules'); Session::flash('gaEventAction', 'delete-rule-group'); @@ -112,8 +111,7 @@ class RuleGroupController extends Controller Session::flash('success', strval(trans('firefly.deleted_rule_group', ['title' => $title]))); Preferences::mark(); - - return redirect(session('rule-groups.delete.url')); + return redirect($this->getPreviousUri('rule-groups.delete.uri')); } /** @@ -141,7 +139,7 @@ class RuleGroupController extends Controller // put previous url in session if not redirect from store (not "return_to_edit"). if (session('rule-groups.edit.fromUpdate') !== true) { - Session::put('rule-groups.edit.url', URL::previous()); + $this->rememberPreviousUri('rule-groups.edit.uri'); } Session::forget('rule-groups.edit.fromUpdate'); Session::flash('gaEventCategory', 'rules'); @@ -225,8 +223,7 @@ class RuleGroupController extends Controller return redirect(route('rule-groups.create'))->withInput(); } - // redirect to previous URL. - return redirect(session('rule-groups.create.url')); + return redirect($this->getPreviousUri('rule-groups.create.uri')); } /** @@ -271,7 +268,7 @@ class RuleGroupController extends Controller } // redirect to previous URL. - return redirect(session('rule-groups.edit.url')); + return redirect($this->getPreviousUri('rule-groups.edit.uri')); } } diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 260adc97e3..bdb3160ea7 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -26,7 +26,6 @@ use Illuminate\Support\Collection; use Navigation; use Preferences; use Session; -use URL; use View; /** @@ -98,7 +97,7 @@ class TagController extends Controller } // put previous url in session if not redirect from store (not "create another"). if (session('tags.create.fromStore') !== true) { - Session::put('tags.create.url', URL::previous()); + $this->rememberPreviousUri('tags.create.uri'); } Session::forget('tags.create.fromStore'); Session::flash('gaEventCategory', 'tags'); @@ -117,7 +116,7 @@ class TagController extends Controller $subTitle = trans('breadcrumbs.delete_tag', ['tag' => e($tag->tag)]); // put previous url in session - Session::put('tags.delete.url', URL::previous()); + $this->rememberPreviousUri('tags.delete.uri'); Session::flash('gaEventCategory', 'tags'); Session::flash('gaEventAction', 'delete'); @@ -138,7 +137,7 @@ class TagController extends Controller Session::flash('success', strval(trans('firefly.deleted_tag', ['tag' => e($tagName)]))); Preferences::mark(); - return redirect(route('tags.index')); + return redirect($this->getPreviousUri('tags.delete.uri')); } /** @@ -174,7 +173,7 @@ class TagController extends Controller // put previous url in session if not redirect from store (not "return_to_edit"). if (session('tags.edit.fromUpdate') !== true) { - Session::put('tags.edit.url', URL::previous()); + $this->rememberPreviousUri('tags.edit.uri'); } Session::forget('tags.edit.fromUpdate'); Session::flash('gaEventCategory', 'tags'); @@ -289,8 +288,7 @@ class TagController extends Controller return redirect(route('tags.create'))->withInput(); } - // redirect to previous URL. - return redirect(session('tags.create.url')); + return redirect($this->getPreviousUri('tags.create.uri')); } @@ -316,7 +314,7 @@ class TagController extends Controller } // redirect to previous URL. - return redirect(session('tags.edit.url')); + return redirect($this->getPreviousUri('tags.edit.uri')); } /** diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index d139f0f414..5a61b060f4 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -25,7 +25,6 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Support\Collection; use Preferences; use Session; -use URL; use View; /** @@ -63,7 +62,7 @@ class MassController extends Controller $subTitle = trans('firefly.mass_delete_journals'); // put previous url in session - Session::put('transactions.mass-delete.url', URL::previous()); + $this->rememberPreviousUri('transactions.mass-delete.uri'); Session::flash('gaEventCategory', 'transactions'); Session::flash('gaEventAction', 'mass-delete'); @@ -104,7 +103,7 @@ class MassController extends Controller Session::flash('success', trans('firefly.mass_deleted_transactions_success', ['amount' => $count])); // redirect to previous URL: - return redirect(session('transactions.mass-delete.url')); + return redirect($this->getPreviousUri('transactions.mass-delete.uri')); } @@ -150,7 +149,7 @@ class MassController extends Controller } // put previous url in session - Session::put('transactions.mass-edit.url', URL::previous()); + $this->rememberPreviousUri('transactions.mass-edit.uri'); Session::flash('gaEventCategory', 'transactions'); Session::flash('gaEventAction', 'mass-edit'); @@ -236,7 +235,7 @@ class MassController extends Controller Session::flash('success', trans('firefly.mass_edited_transactions_success', ['amount' => $count])); // redirect to previous URL: - return redirect(session('transactions.mass-edit.url')); + return redirect($this->getPreviousUri('transactions.mass-edit.uri')); } } diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index 9c006617bd..c031443e1c 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -31,7 +31,6 @@ use Log; use Preferences; use Session; use Steam; -use URL; use View; /** @@ -140,8 +139,7 @@ class SingleController extends Controller // put previous url in session if not redirect from store (not "create another"). if (session('transactions.create.fromStore') !== true) { - $url = URL::previous(); - Session::put('transactions.create.url', $url); + $this->rememberPreviousUri('transactions.create.uri'); } Session::forget('transactions.create.fromStore'); Session::flash('gaEventCategory', 'transactions'); @@ -172,7 +170,7 @@ class SingleController extends Controller $subTitle = trans('firefly.delete_' . $what, ['description' => $journal->description]); // put previous url in session - Session::put('transactions.delete.url', URL::previous()); + $this->rememberPreviousUri('transactions.delete.uri'); Session::flash('gaEventCategory', 'transactions'); Session::flash('gaEventAction', 'delete-' . $what); @@ -200,13 +198,7 @@ class SingleController extends Controller Preferences::mark(); - $uri = session('transactions.delete.url'); - if (!(strpos($uri, sprintf('transactions/show/%s', $journalId)) === false)) { - // uri would point back to transaction - $uri = route('transactions.index', [strtolower($type)]); - } - - return redirect($uri); + return redirect($this->getPreviousUri('transactions.delete.uri')); } /** @@ -275,7 +267,7 @@ class SingleController extends Controller // put previous url in session if not redirect from store (not "return_to_edit"). if (session('transactions.edit.fromUpdate') !== true) { - Session::put('transactions.edit.url', URL::previous()); + $this->rememberPreviousUri('transactions.edit.uri'); } Session::forget('transactions.edit.fromUpdate'); @@ -336,7 +328,7 @@ class SingleController extends Controller // redirect to previous URL. - return redirect(session('transactions.create.url')); + return redirect($this->getPreviousUri('transactions.create.uri')); } @@ -386,7 +378,6 @@ class SingleController extends Controller } // redirect to previous URL. - return redirect(session('transactions.edit.url')); - + return redirect($this->getPreviousUri('transactions.edit.uri')); } } diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index 91b35ddfce..e667cb5f1b 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -30,7 +30,6 @@ use Log; use Preferences; use Session; use Steam; -use URL; use View; /** @@ -107,7 +106,7 @@ class SplitController extends Controller // put previous url in session if not redirect from store (not "return_to_edit"). if (session('transactions.edit-split.fromUpdate') !== true) { - Session::put('transactions.edit-split.url', URL::previous()); + $this->rememberPreviousUri('transactions.edit-split.uri'); } Session::forget('transactions.edit-split.fromUpdate'); @@ -139,7 +138,7 @@ class SplitController extends Controller $data = $this->arrayFromInput($request); $journal = $repository->updateSplitJournal($journal, $data); /** @var array $files */ - $files = $request->hasFile('attachments') ? $request->file('attachments') : null; + $files = $request->hasFile('attachments') ? $request->file('attachments') : null; // save attachments: $this->attachments->saveAttachmentsForModel($journal, $files); @@ -163,8 +162,7 @@ class SplitController extends Controller } // redirect to previous URL. - return redirect(session('transactions.edit-split.url')); - + return redirect($this->getPreviousUri('transactions.edit-split.uri')); } /** From 959a1a08f01b907f488cdf56faae3f415d0836e1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 5 Feb 2017 08:27:23 +0100 Subject: [PATCH 030/276] =?UTF-8?q?Tell=20view=20whether=20we=E2=80=99re?= =?UTF-8?q?=20in=20Sandstorm.IO=20mode.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Middleware/Sandstorm.php | 3 +++ resources/views/layout/default.twig | 4 ++-- resources/views/partials/menu-sidebar.twig | 7 +++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/Http/Middleware/Sandstorm.php b/app/Http/Middleware/Sandstorm.php index ff4093cede..92225ceef5 100644 --- a/app/Http/Middleware/Sandstorm.php +++ b/app/Http/Middleware/Sandstorm.php @@ -15,6 +15,7 @@ use Auth; use Closure; use FireflyIII\User; use Illuminate\Http\Request; +use View; /** * Class Sandstorm @@ -37,6 +38,7 @@ class Sandstorm { // is in Sandstorm environment? $sandstorm = intval(getenv('SANDSTORM')) === 1; + View::share('SANDSTORM', $sandstorm); if (!$sandstorm) { return $next($request); } @@ -55,6 +57,7 @@ class Sandstorm 'password' => str_random(16), ] ); + } diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig index fc86a04dce..08f211925c 100644 --- a/resources/views/layout/default.twig +++ b/resources/views/layout/default.twig @@ -72,13 +72,13 @@ - - + {% if not SANDSTORM %}

    • + {% endif %} diff --git a/resources/views/partials/menu-sidebar.twig b/resources/views/partials/menu-sidebar.twig index 8de86ca538..c5c6210177 100644 --- a/resources/views/partials/menu-sidebar.twig +++ b/resources/views/partials/menu-sidebar.twig @@ -136,6 +136,7 @@ +
  • @@ -147,9 +148,11 @@ From 353db6c4a5f5afec675575dc4367a8c43b283b98 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 5 Feb 2017 08:35:17 +0100 Subject: [PATCH 031/276] Updated composer.lock file. --- composer.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index 26f2d42877..9e6e22bf15 100644 --- a/composer.lock +++ b/composer.lock @@ -518,16 +518,16 @@ }, { "name": "doctrine/dbal", - "version": "v2.5.10", + "version": "v2.5.11", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "fc376f7a61498e18520cd6fa083752a4ca08072b" + "reference": "1b1effbddbdc0f40d1c8f849f44bcddac4f52a48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/fc376f7a61498e18520cd6fa083752a4ca08072b", - "reference": "fc376f7a61498e18520cd6fa083752a4ca08072b", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/1b1effbddbdc0f40d1c8f849f44bcddac4f52a48", + "reference": "1b1effbddbdc0f40d1c8f849f44bcddac4f52a48", "shasum": "" }, "require": { @@ -585,7 +585,7 @@ "persistence", "queryobject" ], - "time": "2017-01-23T23:17:10+00:00" + "time": "2017-02-04T21:20:13+00:00" }, { "name": "doctrine/inflector", @@ -3880,16 +3880,16 @@ }, { "name": "phpunit/phpunit", - "version": "5.7.9", + "version": "5.7.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "69f832b87c731d5cacad7f91948778fe98335fdd" + "reference": "bf0804199f516fe80ffcc48ac6d4741c49baeb6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/69f832b87c731d5cacad7f91948778fe98335fdd", - "reference": "69f832b87c731d5cacad7f91948778fe98335fdd", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bf0804199f516fe80ffcc48ac6d4741c49baeb6e", + "reference": "bf0804199f516fe80ffcc48ac6d4741c49baeb6e", "shasum": "" }, "require": { @@ -3906,11 +3906,11 @@ "phpunit/php-text-template": "~1.2", "phpunit/php-timer": "^1.0.6", "phpunit/phpunit-mock-objects": "^3.2", - "sebastian/comparator": "~1.2.2", + "sebastian/comparator": "^1.2.4", "sebastian/diff": "~1.2", "sebastian/environment": "^1.3.4 || ^2.0", "sebastian/exporter": "~2.0", - "sebastian/global-state": "^1.0 || ^2.0", + "sebastian/global-state": "^1.1", "sebastian/object-enumerator": "~2.0", "sebastian/resource-operations": "~1.0", "sebastian/version": "~1.0|~2.0", @@ -3958,7 +3958,7 @@ "testing", "xunit" ], - "time": "2017-01-28T06:14:33+00:00" + "time": "2017-02-04T09:03:53+00:00" }, { "name": "phpunit/phpunit-mock-objects", From 5e596a9cb7d36279070b5cac8979a92f53bb5e94 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 5 Feb 2017 08:47:37 +0100 Subject: [PATCH 032/276] Remove speedtrap from oh-unit file. --- composer.json | 3 +-- composer.lock | 52 +-------------------------------------------------- phpunit.xml | 4 ---- 3 files changed, 2 insertions(+), 57 deletions(-) diff --git a/composer.json b/composer.json index f89c9630e8..76c2816122 100755 --- a/composer.json +++ b/composer.json @@ -68,8 +68,7 @@ "symfony/css-selector": "3.1.*", "symfony/dom-crawler": "3.1.*", "barryvdh/laravel-debugbar": "2.*", - "barryvdh/laravel-ide-helper": "2.*", - "johnkary/phpunit-speedtrap": "^1.0" + "barryvdh/laravel-ide-helper": "2.*" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index 9e6e22bf15..0792641fa5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "5f1001d0b797b78e769d42adf358620d", + "content-hash": "098af9634cba1c6d47c25ef1d4803367", "packages": [ { "name": "bacon/bacon-qr-code", @@ -3207,56 +3207,6 @@ ], "time": "2015-05-11T14:41:42+00:00" }, - { - "name": "johnkary/phpunit-speedtrap", - "version": "v1.0.1", - "source": { - "type": "git", - "url": "https://github.com/johnkary/phpunit-speedtrap.git", - "reference": "76a26f8a903a9434608cdad2b41c40cd134ea326" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/johnkary/phpunit-speedtrap/zipball/76a26f8a903a9434608cdad2b41c40cd134ea326", - "reference": "76a26f8a903a9434608cdad2b41c40cd134ea326", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "3.7.*|~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-0": { - "JohnKary": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "John Kary", - "email": "john@johnkary.net" - } - ], - "description": "Find slow tests in your PHPUnit test suite", - "homepage": "https://github.com/johnkary/phpunit-speedtrap", - "keywords": [ - "phpunit", - "profile", - "slow" - ], - "time": "2015-09-13T19:01:00+00:00" - }, { "name": "maximebf/debugbar", "version": "1.13.1", diff --git a/phpunit.xml b/phpunit.xml index d439428075..9f026f875f 100755 --- a/phpunit.xml +++ b/phpunit.xml @@ -18,10 +18,6 @@ - - - - ./app From 646b65918dc8ec3307d9dfcba12220dae8899016 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 5 Feb 2017 15:41:23 +0100 Subject: [PATCH 033/276] =?UTF-8?q?Remove=20tests=20since=20they=E2=80=99v?= =?UTF-8?q?e=20been=20changed=20in=20Laravel=205.4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/ExampleTest.php | 27 -- .../Controllers/AccountControllerTest.php | 224 -------------- .../Admin/ConfigurationControllerTest.php | 75 ----- .../Controllers/Admin/HomeControllerTest.php | 44 --- .../Controllers/Admin/UserControllerTest.php | 68 ----- .../Controllers/AttachmentControllerTest.php | 121 -------- .../Controllers/Auth/LoginControllerTest.php | 64 ---- .../Auth/TwoFactorControllerTest.php | 70 ----- .../Controllers/BillControllerTest.php | 179 ----------- .../Controllers/BudgetControllerTest.php | 283 ------------------ .../Controllers/CategoryControllerTest.php | 257 ---------------- .../Chart/AccountControllerTest.php | 154 ---------- .../Controllers/Chart/BillControllerTest.php | 56 ---- .../Chart/BudgetControllerTest.php | 103 ------- .../Chart/CategoryControllerTest.php | 148 --------- .../Chart/CategoryReportControllerTest.php | 82 ----- .../Chart/PiggyBankControllerTest.php | 41 --- .../Chart/ReportControllerTest.php | 61 ---- .../Controllers/CurrencyControllerTest.php | 140 --------- .../Controllers/ExportControllerTest.php | 111 ------- .../Controllers/HelpControllerTest.php | 45 --- .../Controllers/HomeControllerTest.php | 96 ------ .../Controllers/ImportControllerTest.php | 177 ----------- .../Controllers/JsonControllerTest.php | 158 ---------- .../Controllers/NewUserControllerTest.php | 55 ---- .../Controllers/PiggyBankControllerTest.php | 241 --------------- .../Popup/ReportControllerTest.php | 149 --------- .../Controllers/PreferencesControllerTest.php | 87 ------ .../Controllers/ProfileControllerTest.php | 97 ------ .../Report/AccountControllerTest.php | 42 --- .../Report/BalanceControllerTest.php | 41 --- .../Report/BudgetControllerTest.php | 51 ---- .../Report/CategoryControllerTest.php | 61 ---- .../Report/OperationsControllerTest.php | 62 ---- .../Controllers/ReportControllerTest.php | 105 ------- .../Controllers/RuleControllerTest.php | 228 -------------- .../Controllers/RuleGroupControllerTest.php | 173 ----------- .../Controllers/SearchControllerTest.php | 49 --- .../Controllers/TagControllerTest.php | 135 --------- .../Transaction/ConvertControllerTest.php | 121 -------- .../Transaction/MassControllerTest.php | 115 ------- .../Transaction/SingleControllerTest.php | 141 --------- .../Transaction/SplitControllerTest.php | 86 ------ .../Controllers/TransactionControllerTest.php | 89 ------ tests/unit/Models/AccountTest.php | 83 ----- tests/unit/Models/TransactionTypeTest.php | 56 ---- 46 files changed, 5051 deletions(-) delete mode 100644 tests/ExampleTest.php delete mode 100644 tests/acceptance/Controllers/AccountControllerTest.php delete mode 100644 tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php delete mode 100644 tests/acceptance/Controllers/Admin/HomeControllerTest.php delete mode 100644 tests/acceptance/Controllers/Admin/UserControllerTest.php delete mode 100644 tests/acceptance/Controllers/AttachmentControllerTest.php delete mode 100644 tests/acceptance/Controllers/Auth/LoginControllerTest.php delete mode 100644 tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php delete mode 100644 tests/acceptance/Controllers/BillControllerTest.php delete mode 100644 tests/acceptance/Controllers/BudgetControllerTest.php delete mode 100644 tests/acceptance/Controllers/CategoryControllerTest.php delete mode 100644 tests/acceptance/Controllers/Chart/AccountControllerTest.php delete mode 100644 tests/acceptance/Controllers/Chart/BillControllerTest.php delete mode 100644 tests/acceptance/Controllers/Chart/BudgetControllerTest.php delete mode 100644 tests/acceptance/Controllers/Chart/CategoryControllerTest.php delete mode 100644 tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php delete mode 100644 tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php delete mode 100644 tests/acceptance/Controllers/Chart/ReportControllerTest.php delete mode 100644 tests/acceptance/Controllers/CurrencyControllerTest.php delete mode 100644 tests/acceptance/Controllers/ExportControllerTest.php delete mode 100644 tests/acceptance/Controllers/HelpControllerTest.php delete mode 100644 tests/acceptance/Controllers/HomeControllerTest.php delete mode 100644 tests/acceptance/Controllers/ImportControllerTest.php delete mode 100644 tests/acceptance/Controllers/JsonControllerTest.php delete mode 100644 tests/acceptance/Controllers/NewUserControllerTest.php delete mode 100644 tests/acceptance/Controllers/PiggyBankControllerTest.php delete mode 100644 tests/acceptance/Controllers/Popup/ReportControllerTest.php delete mode 100644 tests/acceptance/Controllers/PreferencesControllerTest.php delete mode 100644 tests/acceptance/Controllers/ProfileControllerTest.php delete mode 100644 tests/acceptance/Controllers/Report/AccountControllerTest.php delete mode 100644 tests/acceptance/Controllers/Report/BalanceControllerTest.php delete mode 100644 tests/acceptance/Controllers/Report/BudgetControllerTest.php delete mode 100644 tests/acceptance/Controllers/Report/CategoryControllerTest.php delete mode 100644 tests/acceptance/Controllers/Report/OperationsControllerTest.php delete mode 100644 tests/acceptance/Controllers/ReportControllerTest.php delete mode 100644 tests/acceptance/Controllers/RuleControllerTest.php delete mode 100644 tests/acceptance/Controllers/RuleGroupControllerTest.php delete mode 100644 tests/acceptance/Controllers/SearchControllerTest.php delete mode 100644 tests/acceptance/Controllers/TagControllerTest.php delete mode 100644 tests/acceptance/Controllers/Transaction/ConvertControllerTest.php delete mode 100644 tests/acceptance/Controllers/Transaction/MassControllerTest.php delete mode 100644 tests/acceptance/Controllers/Transaction/SingleControllerTest.php delete mode 100644 tests/acceptance/Controllers/Transaction/SplitControllerTest.php delete mode 100644 tests/acceptance/Controllers/TransactionControllerTest.php delete mode 100644 tests/unit/Models/AccountTest.php delete mode 100644 tests/unit/Models/TransactionTypeTest.php diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php deleted file mode 100644 index 74a0a460d6..0000000000 --- a/tests/ExampleTest.php +++ /dev/null @@ -1,27 +0,0 @@ -visit('/') - ->see('Firefly'); - } -} diff --git a/tests/acceptance/Controllers/AccountControllerTest.php b/tests/acceptance/Controllers/AccountControllerTest.php deleted file mode 100644 index e42a5a8d1a..0000000000 --- a/tests/acceptance/Controllers/AccountControllerTest.php +++ /dev/null @@ -1,224 +0,0 @@ -be($this->user()); - $this->call('GET', route('accounts.create', ['asset'])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
      '); - } - - /** - * @covers FireflyIII\Http\Controllers\AccountController::delete - */ - public function testDelete() - { - $this->be($this->user()); - $this->call('GET', route('accounts.delete', [1])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
        '); - } - - /** - * @covers FireflyIII\Http\Controllers\AccountController::destroy - */ - public function testDestroy() - { - $this->session(['accounts.delete.url' => 'http://localhost/accounts/show/1']); - - $repository = $this->mock(AccountRepositoryInterface::class); - $repository->shouldReceive('find')->withArgs([0])->once()->andReturn(new Account); - $repository->shouldReceive('destroy')->andReturn(true); - - $this->be($this->user()); - $this->call('post', route('accounts.destroy', [1])); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - - /** - * @covers FireflyIII\Http\Controllers\AccountController::edit - */ - public function testEdit() - { - $this->be($this->user()); - $this->call('GET', route('accounts.edit', [1])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
          '); - } - - /** - * @covers FireflyIII\Http\Controllers\AccountController::index - * @covers FireflyIII\Http\Controllers\AccountController::isInArray - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testIndex(string $range) - { - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('GET', route('accounts.index', ['asset'])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
            '); - } - - /** - * @covers FireflyIII\Http\Controllers\AccountController::show - * @covers FireflyIII\Http\Controllers\AccountController::periodEntries - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testShow(string $range) - { - $date = new Carbon; - $this->session(['start' => $date, 'end' => clone $date]); - - $tasker = $this->mock(AccountTaskerInterface::class); - $tasker->shouldReceive('amountOutInPeriod')->withAnyArgs()->andReturn('-1'); - $tasker->shouldReceive('amountInInPeriod')->withAnyArgs()->andReturn('1'); - - // mock repository: - $repository = $this->mock(AccountRepositoryInterface::class); - $repository->shouldReceive('oldestJournalDate')->andReturn(clone $date); - $repository->shouldReceive('getAccountsByType')->andReturn(new Collection); - - - $collector = $this->mock(JournalCollectorInterface::class); - $collector->shouldReceive('setAccounts')->andReturnSelf(); - $collector->shouldReceive('setRange')->andReturnSelf(); - $collector->shouldReceive('setLimit')->andReturnSelf(); - $collector->shouldReceive('setPage')->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); - - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('GET', route('accounts.show', [1])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
              '); - } - - /** - * @covers FireflyIII\Http\Controllers\AccountController::showAll - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testShowAll(string $range) - { - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('GET', route('accounts.show.all', [1])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                '); - } - - /** - * @covers FireflyIII\Http\Controllers\AccountController::showByDate - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testShowByDate(string $range) - { - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('GET', route('accounts.show.date', [1, '2016-01-01'])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                  '); - } - - /** - * @covers FireflyIII\Http\Controllers\AccountController::store - */ - public function testStore() - { - $this->session(['accounts.create.url' => 'http://localhost']); - $this->be($this->user()); - $data = [ - 'name' => 'new account ' . rand(1000, 9999), - 'what' => 'asset', - ]; - - $this->call('post', route('accounts.store', ['asset']), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - - // list should have this new account. - $this->call('GET', route('accounts.index', ['asset'])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                    '); - $this->see($data['name']); - } - - /** - * @covers FireflyIII\Http\Controllers\AccountController::update - */ - public function testUpdate() - { - $this->session(['accounts.edit.url' => 'http://localhost']); - $this->be($this->user()); - $data = [ - 'name' => 'updated account ' . rand(1000, 9999), - 'active' => 1, - 'what' => 'asset', - ]; - - $this->call('post', route('accounts.update', [1]), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - - // list should have this new account. - $this->call('GET', route('accounts.index', ['asset'])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                      '); - $this->see($data['name']); - } -} diff --git a/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php b/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php deleted file mode 100644 index b212b656fd..0000000000 --- a/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php +++ /dev/null @@ -1,75 +0,0 @@ -be($this->user()); - - $falseConfig = new Configuration; - $falseConfig->data = false; - - $trueConfig = new Configuration; - $trueConfig->data = true; - - FireflyConfig::shouldReceive('get')->withArgs(['single_user_mode', true])->once()->andReturn($trueConfig); - FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->times(2)->andReturn($falseConfig); - - $this->call('GET', route('admin.configuration.index')); - $this->assertResponseStatus(200); - - // has bread crumb - $this->see('
                        '); - } - - /** - * @covers \FireflyIII\Http\Controllers\Admin\ConfigurationController::postIndex - */ - public function testPostIndex() - { - $falseConfig = new Configuration; - $falseConfig->data = false; - - FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig); - FireflyConfig::shouldReceive('set')->withArgs(['single_user_mode', false])->once(); - FireflyConfig::shouldReceive('set')->withArgs(['is_demo_site', false])->once(); - - $this->be($this->user()); - $this->call('POST', route('admin.configuration.index.post')); - $this->assertSessionHas('success'); - $this->assertResponseStatus(302); - } -} diff --git a/tests/acceptance/Controllers/Admin/HomeControllerTest.php b/tests/acceptance/Controllers/Admin/HomeControllerTest.php deleted file mode 100644 index 8a2ccefb60..0000000000 --- a/tests/acceptance/Controllers/Admin/HomeControllerTest.php +++ /dev/null @@ -1,44 +0,0 @@ -be($this->user()); - $this->call('GET', route('admin.index')); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                          '); - } - -} diff --git a/tests/acceptance/Controllers/Admin/UserControllerTest.php b/tests/acceptance/Controllers/Admin/UserControllerTest.php deleted file mode 100644 index b5e246bc4d..0000000000 --- a/tests/acceptance/Controllers/Admin/UserControllerTest.php +++ /dev/null @@ -1,68 +0,0 @@ -be($this->user()); - $this->call('GET', route('admin.users.edit', [1])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                            '); - } - - /** - * @covers \FireflyIII\Http\Controllers\Admin\UserController::index - */ - public function testIndex() - { - $this->be($this->user()); - $this->call('GET', route('admin.users')); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                              '); - } - - /** - * @covers \FireflyIII\Http\Controllers\Admin\UserController::show - */ - public function testShow() - { - $this->be($this->user()); - $this->call('GET', route('admin.users.edit', [1])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                '); - } - -} diff --git a/tests/acceptance/Controllers/AttachmentControllerTest.php b/tests/acceptance/Controllers/AttachmentControllerTest.php deleted file mode 100644 index a2fdbc3d07..0000000000 --- a/tests/acceptance/Controllers/AttachmentControllerTest.php +++ /dev/null @@ -1,121 +0,0 @@ -be($this->user()); - $this->call('GET', route('attachments.delete', [1])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                  '); - } - - /** - * @covers \FireflyIII\Http\Controllers\AttachmentController::destroy - */ - public function testDestroy() - { - $this->session(['attachments.delete.url' => 'http://localhost']); - - $repository = $this->mock(AttachmentRepositoryInterface::class); - $repository->shouldReceive('destroy')->andReturn(true); - $this->be($this->user()); - $this->call('post', route('attachments.destroy', [1])); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\AttachmentController::download - */ - public function testDownload() - { - $repository = $this->mock(AttachmentRepositoryInterface::class); - $repository->shouldReceive('exists')->once()->andReturn(true); - $repository->shouldReceive('getContent')->once()->andReturn('This is attachment number one.'); - - $this->be($this->user()); - $this->call('GET', route('attachments.download', [1])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('This is attachment number one.'); - } - - /** - * @covers \FireflyIII\Http\Controllers\AttachmentController::edit - */ - public function testEdit() - { - $this->be($this->user()); - $this->call('GET', route('attachments.edit', [1])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                    '); - } - - /** - * @covers \FireflyIII\Http\Controllers\AttachmentController::preview - */ - public function testPreview() - { - $this->be($this->user()); - $this->call('GET', route('attachments.preview', [1])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\AttachmentController::update - */ - public function testUpdate() - { - $this->session(['attachments.edit.url' => 'http://localhost']); - $data = [ - 'title' => 'Some updated title ' . rand(1000, 9999), - 'notes' => '', - 'description' => '', - ]; - - $this->be($this->user()); - $this->call('post', route('attachments.update', [1]), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - - // view should be updated - $this->be($this->user()); - $this->call('GET', route('attachments.edit', [1])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                      '); - $this->see($data['title']); - } - -} diff --git a/tests/acceptance/Controllers/Auth/LoginControllerTest.php b/tests/acceptance/Controllers/Auth/LoginControllerTest.php deleted file mode 100644 index 5125dccb98..0000000000 --- a/tests/acceptance/Controllers/Auth/LoginControllerTest.php +++ /dev/null @@ -1,64 +0,0 @@ -visit('/login') - ->type('thegrumpydictator@gmail.com', 'email') - ->type('james', 'password') - ->press('Sign In') - ->seePageIs('/') - ->see('thegrumpydictator@gmail.com'); - } - - /** - * @covers \FireflyIII\Http\Controllers\Auth\LoginController::logout - */ - public function testLogout() - { - $this->visit('/logout') - ->seePageIs('/login') - ->see('Sign in to start your session'); - } - - /** - * @covers \FireflyIII\Http\Controllers\Auth\LoginController::showLoginForm - */ - public function testShowLoginForm() - { - $this->visit('/') - ->seePageIs('/login') - ->see('Sign in to start your session'); - } -} diff --git a/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php b/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php deleted file mode 100644 index 5661e5823c..0000000000 --- a/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php +++ /dev/null @@ -1,70 +0,0 @@ -be($this->user()); - - $falsePreference = new Preference; - $falsePreference->data = true; - $secretPreference = new Preference; - $secretPreference->data = 'BlablaSeecret'; - Preferences::shouldReceive('get')->withArgs(['twoFactorAuthEnabled', false])->andReturn($falsePreference); - Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret', null])->andReturn($secretPreference); - Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret'])->andReturn($secretPreference); - $this->call('get', route('two-factor.index')); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Auth\TwoFactorController::lostTwoFactor - */ - public function testLostTwoFactor() - { - $this->be($this->user()); - - $truePreference = new Preference; - $truePreference->data = true; - $secretPreference = new Preference; - $secretPreference->data = 'BlablaSeecret'; - Preferences::shouldReceive('get')->withArgs(['twoFactorAuthEnabled', false])->andReturn($truePreference); - Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret', null])->andReturn($secretPreference); - Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret'])->andReturn($secretPreference); - $this->call('get', route('two-factor.lost')); - $this->assertResponseStatus(200); - } - -} diff --git a/tests/acceptance/Controllers/BillControllerTest.php b/tests/acceptance/Controllers/BillControllerTest.php deleted file mode 100644 index 60a8388697..0000000000 --- a/tests/acceptance/Controllers/BillControllerTest.php +++ /dev/null @@ -1,179 +0,0 @@ -be($this->user()); - $this->call('GET', route('bills.create')); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                        '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BillController::delete - */ - public function testDelete() - { - $this->be($this->user()); - $this->call('GET', route('bills.delete', [1])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                          '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BillController::destroy - */ - public function testDestroy() - { - $repository = $this->mock(BillRepositoryInterface::class); - $repository->shouldReceive('destroy')->andReturn(true); - - $this->session(['bills.delete.url' => 'http://localhost']); - $this->be($this->user()); - $this->call('post', route('bills.destroy', [1])); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\BillController::edit - */ - public function testEdit() - { - $this->be($this->user()); - $this->call('GET', route('bills.edit', [1])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                            '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BillController::index - */ - public function testIndex() - { - $this->be($this->user()); - $this->call('GET', route('bills.index')); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                              '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BillController::rescan - */ - public function testRescan() - { - $repository = $this->mock(BillRepositoryInterface::class); - $repository->shouldReceive('getPossiblyRelatedJournals')->once()->andReturn(new Collection); - $this->be($this->user()); - $this->call('GET', route('bills.rescan', [1])); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\BillController::show - */ - public function testShow() - { - $this->be($this->user()); - $this->call('GET', route('bills.show', [1])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BillController::store - */ - public function testStore() - { - $data = [ - 'name' => 'New Bill ' . rand(1000, 9999), - 'match' => 'some words', - 'amount_min' => '100', - 'amount_currency_id_amount_min' => 1, - 'amount_currency_id_amount_max' => 1, - 'skip' => 0, - 'amount_max' => '100', - 'date' => '2016-01-01', - 'repeat_freq' => 'monthly', - ]; - $this->session(['bills.create.url' => 'http://localhost']); - $this->be($this->user()); - $this->call('post', route('bills.store'), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - - // list must be updated - $this->be($this->user()); - $this->call('GET', route('bills.index')); - $this->assertResponseStatus(200); - $this->see('
                                                  '); - $this->see($data['name']); - } - - /** - * @covers \FireflyIII\Http\Controllers\BillController::update - */ - public function testUpdate() - { - $data = [ - 'name' => 'Updated Bill ' . rand(1000, 9999), - 'match' => 'some more words', - 'amount_min' => '100', - 'amount_currency_id_amount_min' => 1, - 'amount_currency_id_amount_max' => 1, - 'skip' => 0, - 'amount_max' => '100', - 'date' => '2016-01-01', - 'repeat_freq' => 'monthly', - ]; - $this->session(['bills.edit.url' => 'http://localhost']); - $this->be($this->user()); - $this->call('post', route('bills.update', [1]), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - - // list must be updated - $this->be($this->user()); - $this->call('GET', route('bills.index')); - $this->assertResponseStatus(200); - $this->see('
                                                    '); - $this->see($data['name']); - } - -} diff --git a/tests/acceptance/Controllers/BudgetControllerTest.php b/tests/acceptance/Controllers/BudgetControllerTest.php deleted file mode 100644 index 25f0f3b91a..0000000000 --- a/tests/acceptance/Controllers/BudgetControllerTest.php +++ /dev/null @@ -1,283 +0,0 @@ - 200, - ]; - $this->be($this->user()); - $this->call('post', route('budgets.amount', [1]), $data); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::create - */ - public function testCreate() - { - $this->be($this->user()); - $this->call('GET', route('budgets.create')); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                      '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::delete - */ - public function testDelete() - { - $this->be($this->user()); - $this->call('GET', route('budgets.delete', [1])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                        '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::destroy - */ - public function testDestroy() - { - $this->session(['budgets.delete.url' => 'http://localhost']); - - $repository = $this->mock(BudgetRepositoryInterface::class); - $repository->shouldReceive('destroy')->andReturn(true); - - $this->be($this->user()); - $this->call('post', route('budgets.destroy', [1])); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::edit - */ - public function testEdit() - { - $this->be($this->user()); - $this->call('GET', route('budgets.edit', [1])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                          '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::index - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testIndex(string $range) - { - $repository = $this->mock(BudgetRepositoryInterface::class); - $repository->shouldReceive('cleanupBudgets'); - $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection); - $repository->shouldReceive('getInactiveBudgets')->andReturn(new Collection); - $repository->shouldReceive('getAvailableBudget')->andReturn('100.123'); - - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('GET', route('budgets.index')); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                            '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::noBudget - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testNoBudget(string $range) - { - $date = new Carbon(); - $this->session(['start' => $date, 'end' => clone $date]); - - $collector = $this->mock(JournalCollectorInterface::class); - $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); - $collector->shouldReceive('setRange')->andReturnSelf(); - $collector->shouldReceive('setLimit')->andReturnSelf(); - $collector->shouldReceive('setPage')->andReturnSelf(); - $collector->shouldReceive('withoutBudget')->andReturnSelf(); - $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('GET', route('budgets.no-budget')); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                              '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::postUpdateIncome - */ - public function testPostUpdateIncome() - { - $data = [ - 'amount' => '200', - ]; - $this->be($this->user()); - $this->call('post', route('budgets.income.post'), $data); - $this->assertResponseStatus(302); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::show - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testShow(string $range) - { - $date = new Carbon(); - $date->subDay(); - $this->session(['first' => $date]); - - // mock account repository - $accountRepository = $this->mock(AccountRepositoryInterface::class); - $accountRepository->shouldReceive('getAccountsByType')->andReturn(new Collection); - - - // mock budget repository - $budgetRepository = $this->mock(BudgetRepositoryInterface::class); - $budgetRepository->shouldReceive('getBudgetLimits')->andReturn(new Collection); - $budgetRepository->shouldReceive('spentInPeriod')->andReturn('1'); - // mock journal collector: - $collector = $this->mock(JournalCollectorInterface::class); - $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); - $collector->shouldReceive('setRange')->andReturnSelf(); - $collector->shouldReceive('setLimit')->andReturnSelf(); - $collector->shouldReceive('setPage')->andReturnSelf(); - $collector->shouldReceive('setBudget')->andReturnSelf(); - $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); - - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('GET', route('budgets.show', [1])); - $this->assertResponseStatus(200); - $this->see('
                                                                '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::showByBudgetLimit() - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testShowByBudgetLimit(string $range) - { - // mock account repository - $accountRepository = $this->mock(AccountRepositoryInterface::class); - $accountRepository->shouldReceive('getAccountsByType')->andReturn(new Collection); - - // mock budget repository - $budgetRepository = $this->mock(BudgetRepositoryInterface::class); - $budgetRepository->shouldReceive('spentInPeriod')->andReturn('1'); - $budgetRepository->shouldReceive('getBudgetLimits')->andReturn(new Collection); - - // mock journal collector: - $collector = $this->mock(JournalCollectorInterface::class); - $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); - $collector->shouldReceive('setRange')->andReturnSelf(); - $collector->shouldReceive('setLimit')->andReturnSelf(); - $collector->shouldReceive('setPage')->andReturnSelf(); - $collector->shouldReceive('setBudget')->andReturnSelf(); - $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); - - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('GET', route('budgets.show.limit', [1, 1])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                                  '); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::store - */ - public function testStore() - { - $this->session(['budgets.create.url' => 'http://localhost']); - - $data = [ - 'name' => 'New Budget ' . rand(1000, 9999), - ]; - $this->be($this->user()); - $this->call('post', route('budgets.store'), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::update - */ - public function testUpdate() - { - $this->session(['budgets.edit.url' => 'http://localhost']); - - $data = [ - 'name' => 'Updated Budget ' . rand(1000, 9999), - 'active' => 1, - ]; - $this->be($this->user()); - $this->call('post', route('budgets.update', [1]), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\BudgetController::updateIncome - */ - public function testUpdateIncome() - { - // must be in list - $this->be($this->user()); - $this->call('GET', route('budgets.income', [1])); - $this->assertResponseStatus(200); - } - -} diff --git a/tests/acceptance/Controllers/CategoryControllerTest.php b/tests/acceptance/Controllers/CategoryControllerTest.php deleted file mode 100644 index da294075d4..0000000000 --- a/tests/acceptance/Controllers/CategoryControllerTest.php +++ /dev/null @@ -1,257 +0,0 @@ -be($this->user()); - $this->call('GET', route('categories.create')); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                                    '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CategoryController::delete - */ - public function testDelete() - { - $this->be($this->user()); - $this->call('GET', route('categories.delete', [1])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                                      '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CategoryController::destroy - */ - public function testDestroy() - { - $this->session(['categories.delete.url' => 'http://localhost']); - $repository = $this->mock(CategoryRepositoryInterface::class); - $repository->shouldReceive('destroy')->andReturn(true); - - $this->be($this->user()); - $this->call('post', route('categories.destroy', [1])); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\CategoryController::edit - */ - public function testEdit() - { - $this->be($this->user()); - $this->call('GET', route('categories.edit', [1])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                                        '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CategoryController::index - */ - public function testIndex() - { - $this->be($this->user()); - $this->call('GET', route('categories.index')); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                                          '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CategoryController::noCategory - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testNoCategory(string $range) - { - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('GET', route('categories.no-category')); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                                            '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CategoryController::show - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testShow(string $range) - { - - $collector = $this->mock(JournalCollectorInterface::class); - $accRepository = $this->mock(AccountRepositoryInterface::class); - $catRepository = $this->mock(CategoryRepositoryInterface::class); - - $accRepository->shouldReceive('getAccountsByType')->once()->andReturn(new Collection); - $catRepository->shouldReceive('firstUseDate')->once()->andReturn(new Carbon); - - // collector stuff: - $collector->shouldReceive('setPage')->andReturnSelf()->once(); - $collector->shouldReceive('setLimit')->andReturnSelf()->once(); - $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->once(); - $collector->shouldReceive('setRange')->andReturnSelf()->once(); - $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); - $collector->shouldReceive('setCategory')->andReturnSelf()->once(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10))->once(); - - // more repos stuff: - $catRepository->shouldReceive('spentInPeriod')->andReturn('0'); - $catRepository->shouldReceive('earnedInPeriod')->andReturn('0'); - - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('GET', route('categories.show', [1])); - $this->assertResponseStatus(200); - $this->see('
                                                                              '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CategoryController::showAll - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testShowAll(string $range) - { - $collector = $this->mock(JournalCollectorInterface::class); - - // collector stuff: - $collector->shouldReceive('setPage')->andReturnSelf()->once(); - $collector->shouldReceive('setLimit')->andReturnSelf()->once(); - $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->once(); - $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); - $collector->shouldReceive('setCategory')->andReturnSelf()->once(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10))->once(); - - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('GET', route('categories.show.all', [1])); - $this->assertResponseStatus(200); - $this->see('
                                                                                '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CategoryController::showByDate - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testShowByDate(string $range) - { - $collector = $this->mock(JournalCollectorInterface::class); - - // collector stuff: - $collector->shouldReceive('setPage')->andReturnSelf()->once(); - $collector->shouldReceive('setLimit')->andReturnSelf()->once(); - $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->once(); - $collector->shouldReceive('setRange')->andReturnSelf()->once(); - $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); - $collector->shouldReceive('setCategory')->andReturnSelf()->once(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10))->once(); - - // mock category repository - $repository = $this->mock(CategoryRepositoryInterface::class); - $repository->shouldReceive('firstUseDate')->once()->andReturn(new Carbon); - $repository->shouldReceive('spentInPeriod')->andReturn('-1'); - $repository->shouldReceive('earnedInPeriod')->andReturn('1'); - - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('GET', route('categories.show.date', [1, '2015-01-01'])); - $this->assertResponseStatus(200); - $this->see('
                                                                                  '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CategoryController::store - */ - public function testStore() - { - $this->session(['categories.create.url' => 'http://localhost']); - - $data = [ - 'name' => 'New Category ' . rand(1000, 9999), - ]; - $this->be($this->user()); - $this->call('post', route('categories.store'), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - - // must be in list - $this->be($this->user()); - $this->call('GET', route('categories.index')); - $this->assertResponseStatus(200); - $this->see('
                                                                                    '); - $this->see($data['name']); - } - - /** - * @covers \FireflyIII\Http\Controllers\CategoryController::update - */ - public function testUpdate() - { - $this->session(['categories.edit.url' => 'http://localhost']); - - $data = [ - 'name' => 'Updated Category ' . rand(1000, 9999), - 'active' => 1, - ]; - $this->be($this->user()); - $this->call('post', route('categories.update', [1]), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - - // must be in list - $this->be($this->user()); - $this->call('GET', route('categories.index')); - $this->assertResponseStatus(200); - $this->see('
                                                                                      '); - $this->see($data['name']); - } - -} diff --git a/tests/acceptance/Controllers/Chart/AccountControllerTest.php b/tests/acceptance/Controllers/Chart/AccountControllerTest.php deleted file mode 100644 index ab19fe167b..0000000000 --- a/tests/acceptance/Controllers/Chart/AccountControllerTest.php +++ /dev/null @@ -1,154 +0,0 @@ -be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('get', route('chart.account.expense')); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\AccountController::expenseBudget - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testExpenseBudget(string $range) - { - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('get', route('chart.account.expense-budget', [1, '20120101', '20120131'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\AccountController::expenseCategory - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testExpenseCategory(string $range) - { - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('get', route('chart.account.expense-category', [1, '20120101', '20120131'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\AccountController::frontpage - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testFrontpage(string $range) - { - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('get', route('chart.account.frontpage')); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\AccountController::incomeCategory - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testIncomeCategory(string $range) - { - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('get', route('chart.account.income-category', [1, '20120101', '20120131'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\AccountController::period - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testPeriod(string $range) - { - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('get', route('chart.account.period', [1, '2012-01-01'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\AccountController::report - */ - public function testReport() - { - $this->be($this->user()); - $this->call('get', route('chart.account.report', ['1', '20120101', '20120131'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\AccountController::revenueAccounts - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testRevenueAccounts(string $range) - { - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('get', route('chart.account.revenue')); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\AccountController::single - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testSingle(string $range) - { - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('get', route('chart.account.single', [1])); - $this->assertResponseStatus(200); - } - -} diff --git a/tests/acceptance/Controllers/Chart/BillControllerTest.php b/tests/acceptance/Controllers/Chart/BillControllerTest.php deleted file mode 100644 index 657c934f28..0000000000 --- a/tests/acceptance/Controllers/Chart/BillControllerTest.php +++ /dev/null @@ -1,56 +0,0 @@ -be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('get', route('chart.bill.frontpage')); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\BillController::single - */ - public function testSingle() - { - $this->be($this->user()); - $this->call('get', route('chart.bill.single', [1])); - $this->assertResponseStatus(200); - } - -} diff --git a/tests/acceptance/Controllers/Chart/BudgetControllerTest.php b/tests/acceptance/Controllers/Chart/BudgetControllerTest.php deleted file mode 100644 index dd9b49586b..0000000000 --- a/tests/acceptance/Controllers/Chart/BudgetControllerTest.php +++ /dev/null @@ -1,103 +0,0 @@ -mock(BudgetRepositoryInterface::class); - $budgetRepository->shouldReceive('firstUseDate')->andReturn(new Carbon('2015-01-01')); - $budgetRepository->shouldReceive('spentInPeriod')->andReturn('-100'); - - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('get', route('chart.budget.budget', [1])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::budgetLimit - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testBudgetLimit(string $range) - { - $budgetRepository = $this->mock(BudgetRepositoryInterface::class); - $budgetRepository->shouldReceive('spentInPeriod')->andReturn('-100'); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('get', route('chart.budget.budget-limit', [1,1])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::frontpage - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testFrontpage(string $range) - { - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('get', route('chart.budget.frontpage')); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::period - */ - public function testPeriod() - { - $this->be($this->user()); - $this->call('get', route('chart.budget.period', [1,'1','20120101','20120131'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::periodNoBudget - */ - public function testPeriodNoBudget() - { - $this->be($this->user()); - $this->call('get', route('chart.budget.period.no-budget', ['1','20120101','20120131'])); - $this->assertResponseStatus(200); - } -} diff --git a/tests/acceptance/Controllers/Chart/CategoryControllerTest.php b/tests/acceptance/Controllers/Chart/CategoryControllerTest.php deleted file mode 100644 index 06af5d366c..0000000000 --- a/tests/acceptance/Controllers/Chart/CategoryControllerTest.php +++ /dev/null @@ -1,148 +0,0 @@ -mock(CategoryRepositoryInterface::class); - - $catRepository->shouldReceive('spentInPeriod')->andReturn('0'); - $catRepository->shouldReceive('earnedInPeriod')->andReturn('0'); - $catRepository->shouldReceive('firstUseDate')->andReturn(new Carbon); - - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('get', route('chart.category.all', [1])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::currentPeriod - * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::makePeriodChart - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testCurrentPeriod(string $range) - { - // this is actually for makePeriodChart - $accountRepository = $this->mock(AccountRepositoryInterface::class); - $categoryRepository = $this->mock(CategoryRepositoryInterface::class); - $account = $this->user()->accounts()->where('account_type_id', 5)->first(); - $accountRepository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])); - $categoryRepository->shouldReceive('spentInPeriod')->andReturn('0'); - $categoryRepository->shouldReceive('earnedInPeriod')->andReturn('0'); - - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('get', route('chart.category.current', [1])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::frontpage - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testFrontpage(string $range) - { - $accountRepository = $this->mock(AccountRepositoryInterface::class); - $categoryRepository = $this->mock(CategoryRepositoryInterface::class); - $category = $this->user()->categories()->first(); - $account = $this->user()->accounts()->where('account_type_id', 5)->first(); - // get one category - $categoryRepository->shouldReceive('getCategories')->andReturn(new Collection([$category])); - // get one account - $accountRepository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])); - // always return zero - $categoryRepository->shouldReceive('spentInPeriod')->andReturn('0'); - $categoryRepository->shouldReceive('spentInPeriodWithoutCategory')->andReturn('0'); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('get', route('chart.category.frontpage', [1])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::reportPeriod - */ - public function testReportPeriod() - { - $this->be($this->user()); - $this->call('get', route('chart.category.period', [1, '1', '20120101', '20120131'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::reportPeriodNoCategory - */ - public function testReportPeriodNoCategory() - { - $this->be($this->user()); - $this->call('get', route('chart.category.period.no-category', ['1', '20120101', '20120131'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::specificPeriod - * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::makePeriodChart - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testSpecificPeriod(string $range) - { - $accountRepository = $this->mock(AccountRepositoryInterface::class); - $categoryRepository = $this->mock(CategoryRepositoryInterface::class); - $account = $this->user()->accounts()->where('account_type_id', 5)->first(); - $accountRepository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])); - $categoryRepository->shouldReceive('spentInPeriod')->andReturn('0'); - $categoryRepository->shouldReceive('earnedInPeriod')->andReturn('0'); - - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('get', route('chart.category.specific', ['1', '2012-01-01'])); - $this->assertResponseStatus(200); - } -} diff --git a/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php b/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php deleted file mode 100644 index ba948c67ae..0000000000 --- a/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php +++ /dev/null @@ -1,82 +0,0 @@ -be($this->user()); - $this->call('get', route('chart.category.account-expense', ['1', '1', '20120101', '20120131', 0])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::accountIncome - */ - public function testAccountIncome() - { - $this->be($this->user()); - $this->call('get', route('chart.category.account-income', ['1', '1', '20120101', '20120131', 0])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::categoryExpense - */ - public function testCategoryExpense() - { - $this->be($this->user()); - $this->call('get', route('chart.category.category-expense', ['1', '1', '20120101', '20120131', 0])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::categoryIncome - */ - public function testCategoryIncome() - { - $this->be($this->user()); - $this->call('get', route('chart.category.category-income', ['1', '1', '20120101', '20120131', 0])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::mainChart - */ - public function testMainChart() - { - $this->be($this->user()); - $this->call('get', route('chart.category.main', ['1', '1', '20120101', '20120131'])); - $this->assertResponseStatus(200); - } - -} diff --git a/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php b/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php deleted file mode 100644 index f368213e00..0000000000 --- a/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php +++ /dev/null @@ -1,41 +0,0 @@ -be($this->user()); - $this->call('get', route('chart.piggy-bank.history', [1])); - $this->assertResponseStatus(200); - } -} diff --git a/tests/acceptance/Controllers/Chart/ReportControllerTest.php b/tests/acceptance/Controllers/Chart/ReportControllerTest.php deleted file mode 100644 index 7b782367bc..0000000000 --- a/tests/acceptance/Controllers/Chart/ReportControllerTest.php +++ /dev/null @@ -1,61 +0,0 @@ -be($this->user()); - $this->call('get', route('chart.report.net-worth', [1, '20120101', '20120131'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\ReportController::operations - */ - public function testOperations() - { - $this->be($this->user()); - $this->call('get', route('chart.report.operations', [1, '20120101', '20120131'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Chart\ReportController::sum - */ - public function testSum() - { - $this->be($this->user()); - $this->call('get', route('chart.report.sum', [1, '20120101', '20120131'])); - $this->assertResponseStatus(200); - } -} diff --git a/tests/acceptance/Controllers/CurrencyControllerTest.php b/tests/acceptance/Controllers/CurrencyControllerTest.php deleted file mode 100644 index 36d14bacde..0000000000 --- a/tests/acceptance/Controllers/CurrencyControllerTest.php +++ /dev/null @@ -1,140 +0,0 @@ -be($this->user()); - $this->call('GET', route('currencies.create')); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                                                        '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CurrencyController::defaultCurrency - */ - public function testDefaultCurrency() - { - $this->be($this->user()); - $this->call('GET', route('currencies.default', [1])); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\CurrencyController::delete - */ - public function testDelete() - { - $this->be($this->user()); - $this->call('GET', route('currencies.delete', [2])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                                                          '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CurrencyController::destroy - */ - public function testDestroy() - { - $this->session(['currencies.delete.url' => 'http://localhost']); - $repository = $this->mock(CurrencyRepositoryInterface::class); - $repository->shouldReceive('canDeleteCurrency')->andReturn(true); - $repository->shouldReceive('destroy')->andReturn(true); - - $this->be($this->user()); - $this->call('post', route('currencies.destroy', [1])); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\CurrencyController::edit - */ - public function testEdit() - { - $this->be($this->user()); - $this->call('GET', route('currencies.edit', [2])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                                                            '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CurrencyController::index - */ - public function testIndex() - { - $this->be($this->user()); - $this->call('GET', route('currencies.index')); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                                                              '); - } - - /** - * @covers \FireflyIII\Http\Controllers\CurrencyController::store - */ - public function testStore() - { - $this->session(['currencies.create.url' => 'http://localhost']); - $data = [ - 'name' => 'XX', - 'code' => 'XXX', - 'symbol' => 'x', - 'decimal_places' => 2, - ]; - $this->be($this->user()); - $this->call('post', route('currencies.store'), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\CurrencyController::update - */ - public function testUpdate() - { - $this->session(['currencies.edit.url' => 'http://localhost']); - $data = [ - 'name' => 'XA', - 'code' => 'XAX', - 'symbol' => 'a', - 'decimal_places' => 2, - ]; - $this->be($this->user()); - $this->call('post', route('currencies.update', [2]), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } -} diff --git a/tests/acceptance/Controllers/ExportControllerTest.php b/tests/acceptance/Controllers/ExportControllerTest.php deleted file mode 100644 index 39a7bd4ebc..0000000000 --- a/tests/acceptance/Controllers/ExportControllerTest.php +++ /dev/null @@ -1,111 +0,0 @@ -mock(ExportJobRepositoryInterface::class); - $repository->shouldReceive('exists')->once()->andReturn(true); - $repository->shouldReceive('getContent')->once()->andReturn('Some content beep boop'); - - $this->be($this->user()); - $this->call('GET', route('export.download', ['testExport'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\ExportController::getStatus - */ - public function testGetStatus() - { - $this->be($this->user()); - $this->call('GET', route('export.status', ['testExport'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\ExportController::index - */ - public function testIndex() - { - $this->be($this->user()); - $this->call('GET', route('export.index')); - $this->assertResponseStatus(200); - - // has bread crumb - $this->see('
                                                                                                '); - } - - /** - * @covers \FireflyIII\Http\Controllers\ExportController::postIndex - */ - public function testPostIndex() - { - $this->session( - ['first' => new Carbon('2014-01-01')] - ); - - - $data = [ - - 'export_start_range' => '2015-01-01', - 'export_end_range' => '2015-01-21', - 'exportFormat' => 'csv', - 'accounts' => [1], - 'job' => 'testExport', - ]; - - $accountRepository = $this->mock(AccountRepositoryInterface::class); - $accountRepository->shouldReceive('getAccountsById')->withArgs([$data['accounts']])->andReturn(new Collection); - - $processor = $this->mock(ProcessorInterface::class); - $processor->shouldReceive('collectJournals')->once(); - $processor->shouldReceive('convertJournals')->once(); - $processor->shouldReceive('exportJournals')->once(); - $processor->shouldReceive('createZipFile')->once(); - - $repository = $this->mock(ExportJobRepositoryInterface::class); - $repository->shouldReceive('changeStatus')->andReturn(true); - $repository->shouldReceive('findByKey')->andReturn(new ExportJob); - - $this->be($this->user()); - - $this->call('post', route('export.export'), $data); - $this->assertResponseStatus(200); - $this->see('ok'); - } - -} diff --git a/tests/acceptance/Controllers/HelpControllerTest.php b/tests/acceptance/Controllers/HelpControllerTest.php deleted file mode 100644 index 9acadb6482..0000000000 --- a/tests/acceptance/Controllers/HelpControllerTest.php +++ /dev/null @@ -1,45 +0,0 @@ -mock(HelpInterface::class); - $help->shouldReceive('hasRoute')->andReturn(true)->once(); - $help->shouldReceive('inCache')->andReturn(false)->once(); - $help->shouldReceive('getFromGithub')->andReturn('Help content here.')->once(); - $help->shouldReceive('putInCache')->once(); - - $this->be($this->user()); - $this->call('GET', route('help.show', ['index'])); - $this->assertResponseStatus(200); - } -} diff --git a/tests/acceptance/Controllers/HomeControllerTest.php b/tests/acceptance/Controllers/HomeControllerTest.php deleted file mode 100644 index 5babd78d5c..0000000000 --- a/tests/acceptance/Controllers/HomeControllerTest.php +++ /dev/null @@ -1,96 +0,0 @@ -be($this->user()); - - $args = [ - 'start' => '2012-01-01', - 'end' => '2012-04-01', - ]; - - $this->call('POST', route('daterange'), $args); - $this->assertResponseStatus(200); - $this->assertSessionHas('warning', '91 days of data may take a while to load.'); - } - - /** - * @covers FireflyIII\Http\Controllers\HomeController::displayError - */ - public function testDisplayError() - { - $this->be($this->user()); - $this->call('GET', route('error')); - $this->assertResponseStatus(500); - } - - /** - * @covers FireflyIII\Http\Controllers\HomeController::flush - */ - public function testFlush() - { - $this->be($this->user()); - $this->call('GET', route('flush')); - $this->assertResponseStatus(302); - } - - /** - * @covers FireflyIII\Http\Controllers\HomeController::index - * @covers FireflyIII\Http\Controllers\Controller::__construct - * @dataProvider dateRangeProvider - * - * @param $range - */ - public function testIndex(string $range) - { - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('GET', route('index')); - $this->assertResponseStatus(200); - } - - /** - * @covers FireflyIII\Http\Controllers\HomeController::routes - * @dataProvider dateRangeProvider - * - * @param string $range - */ - public function testRoutes(string $range) - { - $this->be($this->user()); - $this->changeDateRange($this->user(), $range); - $this->call('GET', route('all-routes')); - $this->assertResponseStatus(200); - } - - /** - * @covers FireflyIII\Http\Controllers\HomeController::testFlash - */ - public function testTestFlash() - { - $this->be($this->user()); - $this->call('GET', route('test-flash')); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - $this->assertSessionHas('info'); - $this->assertSessionHas('warning'); - $this->assertSessionHas('error'); - } -} diff --git a/tests/acceptance/Controllers/ImportControllerTest.php b/tests/acceptance/Controllers/ImportControllerTest.php deleted file mode 100644 index 4c4c4dda3d..0000000000 --- a/tests/acceptance/Controllers/ImportControllerTest.php +++ /dev/null @@ -1,177 +0,0 @@ -be($this->user()); - $this->call('GET', route('import.complete', ['complete'])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                  '); - } - - /** - * @covers \FireflyIII\Http\Controllers\ImportController::configure - */ - public function testConfigure() - { - $this->be($this->user()); - $this->call('GET', route('import.configure', ['configure'])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                    '); - } - - /** - * @covers \FireflyIII\Http\Controllers\ImportController::download - */ - public function testDownload() - { - $this->be($this->user()); - $this->call('GET', route('import.download', ['configure'])); - $this->assertResponseStatus(200); - $this->see('[]'); - } - - /** - * @covers \FireflyIII\Http\Controllers\ImportController::finished - */ - public function testFinished() - { - $this->be($this->user()); - $this->call('GET', route('import.finished', ['finished'])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                      '); - } - - /** - * @covers \FireflyIII\Http\Controllers\ImportController::index - */ - public function testIndex() - { - $this->be($this->user()); - $this->call('GET', route('import.index')); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\ImportController::json - */ - public function testJson() - { - $this->be($this->user()); - $this->call('GET', route('import.json', ['configure'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\ImportController::postConfigure - */ - public function testPostConfigure() - { - $importer = $this->mock(CsvSetup::class); - $importer->shouldReceive('setJob')->once(); - $importer->shouldReceive('saveImportConfiguration')->once(); - - $data = []; - $this->be($this->user()); - $this->call('post', route('import.process-configuration', ['p-configure']), $data); - $this->assertResponseStatus(302); - $this->assertRedirectedToRoute('import.settings', ['p-configure']); - } - - /** - * @covers \FireflyIII\Http\Controllers\ImportController::postSettings - */ - public function testPostSettings() - { - $importer = $this->mock(CsvSetup::class); - $importer->shouldReceive('setJob')->once(); - $importer->shouldReceive('storeSettings')->once(); - $data = []; - $this->be($this->user()); - $this->call('post', route('import.post-settings', ['p-settings']), $data); - $this->assertResponseStatus(302); - $this->assertRedirectedToRoute('import.settings', ['p-settings']); - } - - /** - * @covers \FireflyIII\Http\Controllers\ImportController::settings - */ - public function testSettings() - { - $importer = $this->mock(CsvSetup::class); - $importer->shouldReceive('setJob')->once(); - $importer->shouldReceive('requireUserSettings')->once()->andReturn(false); - $this->be($this->user()); - $this->call('get', route('import.settings', ['settings'])); - $this->assertResponseStatus(302); - $this->assertRedirectedToRoute('import.complete', ['settings']); - } - - /** - * @covers \FireflyIII\Http\Controllers\ImportController::start - */ - public function testStart() - { - /** @var ImportProcedureInterface $procedure */ - $procedure = $this->mock(ImportProcedureInterface::class); - - $procedure->shouldReceive('runImport'); - - $this->be($this->user()); - $this->call('post', route('import.start', ['complete'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\ImportController::status - * Implement testStatus(). - */ - public function testStatus() - { - // complete - $this->be($this->user()); - $this->call('get', route('import.status', ['complete'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\ImportController::upload - */ - public function testUpload() - { - $path = resource_path('stubs/csv.csv'); - $file = new UploadedFile($path, 'upload.csv', filesize($path), 'text/csv', null, true); - $this->call('POST', route('import.upload'), [], [], ['import_file' => $file], ['Accept' => 'application/json']); - $this->assertResponseStatus(302); - } -} diff --git a/tests/acceptance/Controllers/JsonControllerTest.php b/tests/acceptance/Controllers/JsonControllerTest.php deleted file mode 100644 index bcd30afada..0000000000 --- a/tests/acceptance/Controllers/JsonControllerTest.php +++ /dev/null @@ -1,158 +0,0 @@ -be($this->user()); - $this->call('get', route('json.action')); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\JsonController::boxBillsPaid - */ - public function testBoxBillsPaid() - { - $this->be($this->user()); - $this->call('get', route('json.box.paid')); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\JsonController::boxBillsUnpaid - */ - public function testBoxBillsUnpaid() - { - $this->be($this->user()); - $this->call('get', route('json.box.unpaid')); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\JsonController::boxIn - */ - public function testBoxIn() - { - $this->be($this->user()); - $this->call('get', route('json.box.in')); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\JsonController::boxOut - */ - public function testBoxOut() - { - $this->be($this->user()); - $this->call('get', route('json.box.out')); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\JsonController::categories - */ - public function testCategories() - { - $this->be($this->user()); - $this->call('get', route('json.categories')); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\JsonController::endTour - */ - public function testEndTour() - { - $this->be($this->user()); - $this->call('post', route('json.end-tour')); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\JsonController::expenseAccounts - */ - public function testExpenseAccounts() - { - $this->be($this->user()); - $this->call('get', route('json.expense-accounts')); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\JsonController::revenueAccounts - */ - public function testRevenueAccounts() - { - $this->be($this->user()); - $this->call('get', route('json.revenue-accounts')); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\JsonController::tags - */ - public function testTags() - { - $this->be($this->user()); - $this->call('get', route('json.tags')); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\JsonController::tour - */ - public function testTour() - { - $this->be($this->user()); - $this->call('get', route('json.tour')); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\JsonController::transactionJournals - */ - public function testTransactionJournals() - { - $this->be($this->user()); - $this->call('get', route('json.transaction-journals', ['deposit'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\JsonController::trigger - */ - public function testTrigger() - { - $this->be($this->user()); - $this->call('get', route('json.trigger')); - $this->assertResponseStatus(200); - } -} diff --git a/tests/acceptance/Controllers/NewUserControllerTest.php b/tests/acceptance/Controllers/NewUserControllerTest.php deleted file mode 100644 index 7c98ec5583..0000000000 --- a/tests/acceptance/Controllers/NewUserControllerTest.php +++ /dev/null @@ -1,55 +0,0 @@ -be($this->emptyUser()); - $this->call('get', route('new-user.index')); - $this->assertResponseStatus(200); - $this->see('
                                                                                                        '); - } - - /** - * @covers \FireflyIII\Http\Controllers\NewUserController::submit - */ - public function testSubmit() - { - $data = [ - 'bank_name' => 'New bank', - 'bank_balance' => 100, - ]; - $this->be($this->emptyUser()); - $this->call('post', route('new-user.submit'), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - -} diff --git a/tests/acceptance/Controllers/PiggyBankControllerTest.php b/tests/acceptance/Controllers/PiggyBankControllerTest.php deleted file mode 100644 index d480600d21..0000000000 --- a/tests/acceptance/Controllers/PiggyBankControllerTest.php +++ /dev/null @@ -1,241 +0,0 @@ -be($this->user()); - $this->call('get', route('piggy-banks.add', [1])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::addMobile - */ - public function testAddMobile() - { - $this->be($this->user()); - $this->call('get', route('piggy-banks.add-money-mobile', [1])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                          '); - } - - /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::create - */ - public function testCreate() - { - $this->be($this->user()); - $this->call('get', route('piggy-banks.create')); - $this->assertResponseStatus(200); - $this->see('
                                                                                                            '); - } - - /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::delete - */ - public function testDelete() - { - $this->be($this->user()); - $this->call('get', route('piggy-banks.delete', [1])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                              '); - } - - /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::destroy - */ - public function testDestroy() - { - $repository = $this->mock(PiggyBankRepositoryInterface::class); - $repository->shouldReceive('destroy')->andReturn(true); - - $this->session(['piggy-banks.delete.url' => 'http://localhost']); - $this->be($this->user()); - $this->call('post', route('piggy-banks.destroy', [2])); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - $this->assertRedirectedToRoute('index'); - } - - /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::edit - */ - public function testEdit() - { - $this->be($this->user()); - $this->call('get', route('piggy-banks.edit', [1])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                '); - } - - /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::index - */ - public function testIndex() - { - $this->be($this->user()); - $this->call('get', route('piggy-banks.index')); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                  '); - } - - /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::order - */ - public function testOrder() - { - $this->be($this->user()); - $this->call('post', route('piggy-banks.order', [1, 2])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::postAdd - */ - public function testPostAdd() - { - $data = ['amount' => '1.123']; - $this->be($this->user()); - $this->call('post', route('piggy-banks.add', [1]), $data); - $this->assertResponseStatus(302); - $this->assertRedirectedToRoute('piggy-banks.index'); - $this->assertSessionHas('success'); - } - - /** - * Add the exact amount to fill a piggy bank - * - * @covers \FireflyIII\Http\Controllers\PiggyBankController::postAdd - */ - public function testPostAddExact() - { - // find a piggy with current amount = 0. - $piggy = PiggyBank::leftJoin('piggy_bank_repetitions', 'piggy_bank_repetitions.piggy_bank_id', '=', 'piggy_banks.id') - ->where('currentamount', 0) - ->first(['piggy_banks.id', 'targetamount']); - - - $data = ['amount' => strval($piggy->targetamount)]; - $this->be($this->user()); - $this->call('post', route('piggy-banks.add', [$piggy->id]), $data); - $this->assertResponseStatus(302); - $this->assertRedirectedToRoute('piggy-banks.index'); - $this->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::postRemove - */ - public function testPostRemove() - { - $data = ['amount' => '1.123']; - $this->be($this->user()); - $this->call('post', route('piggy-banks.remove', [1]), $data); - $this->assertResponseStatus(302); - $this->assertRedirectedToRoute('piggy-banks.index'); - $this->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::remove - */ - public function testRemove() - { - $this->be($this->user()); - $this->call('get', route('piggy-banks.remove', [1])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::removeMobile - */ - public function testRemoveMobile() - { - $this->be($this->user()); - $this->call('get', route('piggy-banks.remove-money-mobile', [1])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                    '); - } - - /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::show - */ - public function testShow() - { - $this->be($this->user()); - $this->call('get', route('piggy-banks.show', [1])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                      '); - } - - /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::store - */ - public function testStore() - { - $this->session(['piggy-banks.create.url' => 'http://localhost']); - $data = [ - 'name' => 'Piggy ' . rand(999, 10000), - 'targetamount' => '100.123', - 'account_id' => 2, - 'amount_currency_id_targetamount' => 1, - - ]; - $this->be($this->user()); - $this->call('post', route('piggy-banks.store'), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - $this->assertRedirectedToRoute('index'); - } - - /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::update - */ - public function testUpdate() - { - $this->session(['piggy-banks.edit.url' => 'http://localhost']); - $data = [ - 'name' => 'Updated Piggy ' . rand(999, 10000), - 'targetamount' => '100.123', - 'account_id' => 2, - 'amount_currency_id_targetamount' => 1, - - ]; - $this->be($this->user()); - $this->call('post', route('piggy-banks.update', [3]), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - $this->assertRedirectedToRoute('index'); - } - -} diff --git a/tests/acceptance/Controllers/Popup/ReportControllerTest.php b/tests/acceptance/Controllers/Popup/ReportControllerTest.php deleted file mode 100644 index e601cc167e..0000000000 --- a/tests/acceptance/Controllers/Popup/ReportControllerTest.php +++ /dev/null @@ -1,149 +0,0 @@ -be($this->user()); - $arguments = [ - 'attributes' => [ - 'location' => 'balance-amount', - 'startDate' => Carbon::now()->startOfMonth()->format('Ymd'), - 'endDate' => Carbon::now()->endOfMonth()->format('Ymd'), - 'accounts' => 1, - 'accountId' => 1, - 'categoryId' => 1, - 'budgetId' => 1, - 'role' => 3, // diff role, is complicated. - ], - ]; - $uri = route('popup.general') . '?' . http_build_query($arguments); - $this->call('get', $uri); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general - */ - public function testBudgetSpentAmount() - { - - $this->be($this->user()); - $arguments = [ - 'attributes' => [ - 'location' => 'budget-spent-amount', - 'startDate' => Carbon::now()->startOfMonth()->format('Ymd'), - 'endDate' => Carbon::now()->endOfMonth()->format('Ymd'), - 'accounts' => 1, - 'accountId' => 1, - 'categoryId' => 1, - 'budgetId' => 1, - ], - ]; - $uri = route('popup.general') . '?' . http_build_query($arguments); - $this->call('get', $uri); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general - */ - public function testCategoryEntry() - { - - $this->be($this->user()); - $arguments = [ - 'attributes' => [ - 'location' => 'category-entry', - 'startDate' => Carbon::now()->startOfMonth()->format('Ymd'), - 'endDate' => Carbon::now()->endOfMonth()->format('Ymd'), - 'accounts' => 1, - 'accountId' => 1, - 'categoryId' => 1, - 'budgetId' => 1, - ], - ]; - $uri = route('popup.general') . '?' . http_build_query($arguments); - $this->call('get', $uri); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general - */ - public function testExpenseEntry() - { - - $this->be($this->user()); - $arguments = [ - 'attributes' => [ - 'location' => 'expense-entry', - 'startDate' => Carbon::now()->startOfMonth()->format('Ymd'), - 'endDate' => Carbon::now()->endOfMonth()->format('Ymd'), - 'accounts' => 1, - 'accountId' => 1, - 'categoryId' => 1, - 'budgetId' => 1, - ], - ]; - $uri = route('popup.general') . '?' . http_build_query($arguments); - $this->call('get', $uri); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general - */ - public function testIncomeEntry() - { - - $this->be($this->user()); - $arguments = [ - 'attributes' => [ - 'location' => 'income-entry', - 'startDate' => Carbon::now()->startOfMonth()->format('Ymd'), - 'endDate' => Carbon::now()->endOfMonth()->format('Ymd'), - 'accounts' => 1, - 'accountId' => 1, - 'categoryId' => 1, - 'budgetId' => 1, - ], - ]; - $uri = route('popup.general') . '?' . http_build_query($arguments); - $this->call('get', $uri); - $this->assertResponseStatus(200); - } - -} diff --git a/tests/acceptance/Controllers/PreferencesControllerTest.php b/tests/acceptance/Controllers/PreferencesControllerTest.php deleted file mode 100644 index 782453bd0d..0000000000 --- a/tests/acceptance/Controllers/PreferencesControllerTest.php +++ /dev/null @@ -1,87 +0,0 @@ -be($this->user()); - $this->call('get', route('preferences.code')); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                        '); - } - - /** - * @covers \FireflyIII\Http\Controllers\PreferencesController::deleteCode - */ - public function testDeleteCode() - { - $this->be($this->user()); - $this->call('get', route('preferences.delete-code')); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - $this->assertSessionHas('info'); - $this->assertRedirectedToRoute('preferences.index'); - } - - /** - * @covers \FireflyIII\Http\Controllers\PreferencesController::index - */ - public function testIndex() - { - $this->be($this->user()); - $this->call('get', route('preferences.index')); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                          '); - } - - /** - * @covers \FireflyIII\Http\Controllers\PreferencesController::postIndex - */ - public function testPostIndex() - { - $data = [ - 'fiscalYearStart' => '2016-01-01', - 'frontPageAccounts' => [], - 'viewRange' => '1M', - 'customFiscalYear' => 0, - 'showDepositsFrontpage' => 0, - 'transactionPageSize' => 100, - 'twoFactorAuthEnabled' => 0, - 'language' => 'en_US', - 'tj' => [], - ]; - - $this->be($this->user()); - $this->call('post', route('preferences.update'), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - $this->assertRedirectedToRoute('preferences.index'); - } -} diff --git a/tests/acceptance/Controllers/ProfileControllerTest.php b/tests/acceptance/Controllers/ProfileControllerTest.php deleted file mode 100644 index f11a4556a0..0000000000 --- a/tests/acceptance/Controllers/ProfileControllerTest.php +++ /dev/null @@ -1,97 +0,0 @@ -be($this->user()); - $this->call('get', route('profile.change-password')); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                            '); - } - - /** - * @covers \FireflyIII\Http\Controllers\ProfileController::deleteAccount - */ - public function testDeleteAccount() - { - $this->be($this->user()); - $this->call('get', route('profile.delete-account')); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                              '); - } - - /** - * @covers \FireflyIII\Http\Controllers\ProfileController::index - */ - public function testIndex() - { - $this->be($this->user()); - $this->call('get', route('profile.index')); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                '); - } - - /** - * @covers \FireflyIII\Http\Controllers\ProfileController::postChangePassword - */ - public function testPostChangePassword() - { - $repository = $this->mock(UserRepositoryInterface::class); - $repository->shouldReceive('changePassword'); - - $data = [ - 'current_password' => 'james', - 'new_password' => 'james2', - 'new_password_confirmation' => 'james2', - ]; - $this->be($this->user()); - $this->call('post', route('profile.change-password.post'), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\ProfileController::postDeleteAccount - */ - public function testPostDeleteAccount() - { - $repository = $this->mock(UserRepositoryInterface::class); - $repository->shouldReceive('destroy'); - $data = [ - 'password' => 'james', - ]; - $this->be($this->user()); - $this->call('post', route('profile.delete-account.post'), $data); - $this->assertResponseStatus(302); - $this->assertRedirectedToRoute('index'); - } -} diff --git a/tests/acceptance/Controllers/Report/AccountControllerTest.php b/tests/acceptance/Controllers/Report/AccountControllerTest.php deleted file mode 100644 index 40a1968bcf..0000000000 --- a/tests/acceptance/Controllers/Report/AccountControllerTest.php +++ /dev/null @@ -1,42 +0,0 @@ -be($this->user()); - $this->call('get', route('report-data.account.general', ['1', '20120101', '20120131'])); - $this->assertResponseStatus(200); - } - -} diff --git a/tests/acceptance/Controllers/Report/BalanceControllerTest.php b/tests/acceptance/Controllers/Report/BalanceControllerTest.php deleted file mode 100644 index aadfa39ec7..0000000000 --- a/tests/acceptance/Controllers/Report/BalanceControllerTest.php +++ /dev/null @@ -1,41 +0,0 @@ -be($this->user()); - $this->call('get', route('report-data.balance.general', ['1', '20120101', '20120131'])); - $this->assertResponseStatus(200); - } -} diff --git a/tests/acceptance/Controllers/Report/BudgetControllerTest.php b/tests/acceptance/Controllers/Report/BudgetControllerTest.php deleted file mode 100644 index e13c2bf47c..0000000000 --- a/tests/acceptance/Controllers/Report/BudgetControllerTest.php +++ /dev/null @@ -1,51 +0,0 @@ -be($this->user()); - $this->call('get', route('report-data.budget.general', ['1', '20120101', '20120131'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Report\BudgetController::period - */ - public function testPeriod() - { - $this->be($this->user()); - $this->call('get', route('report-data.budget.period', ['1', '20120101', '20120131'])); - $this->assertResponseStatus(200); - } -} diff --git a/tests/acceptance/Controllers/Report/CategoryControllerTest.php b/tests/acceptance/Controllers/Report/CategoryControllerTest.php deleted file mode 100644 index 44f12f599d..0000000000 --- a/tests/acceptance/Controllers/Report/CategoryControllerTest.php +++ /dev/null @@ -1,61 +0,0 @@ -be($this->user()); - $this->call('get', route('report-data.category.expenses', ['1', '20120101', '20120131'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Report\CategoryController::income - */ - public function testIncome() - { - $this->be($this->user()); - $this->call('get', route('report-data.category.income', ['1', '20120101', '20120131'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Report\CategoryController::operations - */ - public function testOperations() - { - $this->be($this->user()); - $this->call('get', route('report-data.category.operations', ['1', '20120101', '20120131'])); - $this->assertResponseStatus(200); - } -} diff --git a/tests/acceptance/Controllers/Report/OperationsControllerTest.php b/tests/acceptance/Controllers/Report/OperationsControllerTest.php deleted file mode 100644 index 027bc2a0e9..0000000000 --- a/tests/acceptance/Controllers/Report/OperationsControllerTest.php +++ /dev/null @@ -1,62 +0,0 @@ -be($this->user()); - $this->call('get', route('report-data.operations.expenses', ['1', '20120101', '20120131'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Report\OperationsController::income - */ - public function testIncome() - { - $this->be($this->user()); - $this->call('get', route('report-data.operations.income', ['1', '20120101', '20120131'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Report\OperationsController::operations - */ - public function testOperations() - { - $this->be($this->user()); - $this->call('get', route('report-data.operations.operations', ['1', '20120101', '20120131'])); - $this->assertResponseStatus(200); - } - -} diff --git a/tests/acceptance/Controllers/ReportControllerTest.php b/tests/acceptance/Controllers/ReportControllerTest.php deleted file mode 100644 index d975bb4581..0000000000 --- a/tests/acceptance/Controllers/ReportControllerTest.php +++ /dev/null @@ -1,105 +0,0 @@ -be($this->user()); - $this->call('get', route('reports.report.audit', [1, '20160101', '20160131'])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                  '); - } - - /** - * @covers \FireflyIII\Http\Controllers\ReportController::budgetReport - */ - public function testBudgetReport() - { - $this->be($this->user()); - $this->call('get', route('reports.report.budget', [1, 1, '20160101', '20160131'])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                    '); - } - - /** - * @covers \FireflyIII\Http\Controllers\ReportController::categoryReport - */ - public function testCategoryReport() - { - $this->be($this->user()); - $this->call('get', route('reports.report.category', [1, 1, '20160101', '20160131'])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                      '); - } - - /** - * @covers \FireflyIII\Http\Controllers\ReportController::defaultReport - */ - public function testDefaultReport() - { - $this->be($this->user()); - $this->call('get', route('reports.report.default', [1, '20160101', '20160131'])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                        '); - } - - /** - * @covers \FireflyIII\Http\Controllers\ReportController::index - */ - public function testIndex() - { - $this->be($this->user()); - $this->call('get', route('reports.index')); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                          '); - } - - /** - * @covers \FireflyIII\Http\Controllers\ReportController::options - */ - public function testOptions() - { - $this->be($this->user()); - $this->call('get', route('reports.options', ['default'])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\ReportController::postIndex - */ - public function testPostIndex() - { - $this->be($this->user()); - $this->call('post', route('reports.index.post')); - $this->assertResponseStatus(302); - } -} diff --git a/tests/acceptance/Controllers/RuleControllerTest.php b/tests/acceptance/Controllers/RuleControllerTest.php deleted file mode 100644 index 41ad37571c..0000000000 --- a/tests/acceptance/Controllers/RuleControllerTest.php +++ /dev/null @@ -1,228 +0,0 @@ -be($this->user()); - $this->call('get', route('rules.create', [1])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                            '); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController::delete - */ - public function testDelete() - { - $this->be($this->user()); - $this->call('get', route('rules.delete', [1])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                              '); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController::destroy - */ - public function testDestroy() - { - $repository = $this->mock(RuleRepositoryInterface::class); - $repository->shouldReceive('destroy'); - - $this->session(['rules.delete.url' => 'http://localhost']); - $this->be($this->user()); - $this->call('post', route('rules.destroy', [1])); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - $this->assertRedirectedToRoute('index'); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController::down - */ - public function testDown() - { - $this->be($this->user()); - $this->call('get', route('rules.down', [1])); - $this->assertResponseStatus(302); - $this->assertRedirectedToRoute('rules.index'); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController::edit - */ - public function testEdit() - { - $this->be($this->user()); - $this->call('get', route('rules.edit', [1])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                                '); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController::index - */ - public function testIndex() - { - $this->be($this->user()); - $this->call('get', route('rules.index')); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                                  '); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController::reorderRuleActions - */ - public function testReorderRuleActions() - { - $data = [ - 'triggers' => [1, 2, 3], - ]; - - $repository = $this->mock(RuleRepositoryInterface::class); - $repository->shouldReceive('reorderRuleActions'); - - $this->be($this->user()); - $this->call('post', route('rules.reorder-actions', [1]), $data); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController::reorderRuleTriggers - */ - public function testReorderRuleTriggers() - { - $data = [ - 'triggers' => [1, 2, 3], - ]; - - $repository = $this->mock(RuleRepositoryInterface::class); - $repository->shouldReceive('reorderRuleTriggers'); - - $this->be($this->user()); - $this->call('post', route('rules.reorder-triggers', [1]), $data); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController::store - */ - public function testStore() - { - $this->session(['rules.create.url' => 'http://localhost']); - $data = [ - 'rule_group_id' => 1, - 'active' => 1, - 'title' => 'A', - 'trigger' => 'store-journal', - 'description' => 'D', - 'rule-trigger' => [ - 1 => 'from_account_starts', - ], - 'rule-trigger-value' => [ - 1 => 'B', - ], - 'rule-action' => [ - 1 => 'set_category', - ], - 'rule-action-value' => [ - 1 => 'C', - ], - ]; - - $repository = $this->mock(RuleRepositoryInterface::class); - $repository->shouldReceive('store')->andReturn(new Rule); - - $this->be($this->user()); - $this->call('post', route('rules.store', [1]), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - - /** - * This actually hits an error and not the actually code but OK. - * - * @covers \FireflyIII\Http\Controllers\RuleController::testTriggers - */ - public function testTestTriggers() - { - $this->be($this->user()); - $this->call('get', route('rules.test-triggers', [1])); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController::up - */ - public function testUp() - { - $this->be($this->user()); - $this->call('get', route('rules.up', [1])); - $this->assertResponseStatus(302); - $this->assertRedirectedToRoute('rules.index'); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleController::update - */ - public function testUpdate() - { - $data = [ - 'rule_group_id' => 1, - 'title' => 'Your first default rule', - 'trigger' => 'store-journal', - 'active' => 1, - 'description' => 'This rule is an example. You can safely delete it.', - 'rule-trigger' => [ - 1 => 'description_is', - ], - 'rule-trigger-value' => [ - 1 => 'something', - ], - 'rule-action' => [ - 1 => 'prepend_description', - ], - 'rule-action-value' => [ - 1 => 'Bla bla', - ], - ]; - $this->session(['rules.edit.url' => 'http://localhost']); - - $repository = $this->mock(RuleRepositoryInterface::class); - $repository->shouldReceive('update'); - - $this->be($this->user()); - $this->call('post', route('rules.update', [1]), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } -} diff --git a/tests/acceptance/Controllers/RuleGroupControllerTest.php b/tests/acceptance/Controllers/RuleGroupControllerTest.php deleted file mode 100644 index b61a95409e..0000000000 --- a/tests/acceptance/Controllers/RuleGroupControllerTest.php +++ /dev/null @@ -1,173 +0,0 @@ -be($this->user()); - $this->call('get', route('rule-groups.create')); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                                    '); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleGroupController::delete - */ - public function testDelete() - { - $this->be($this->user()); - $this->call('get', route('rule-groups.delete', [1])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                                      '); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleGroupController::destroy - */ - public function testDestroy() - { - $repository = $this->mock(RuleGroupRepositoryInterface::class); - $repository->shouldReceive('destroy'); - - $this->session(['rule-groups.delete.url' => 'http://localhost']); - $this->be($this->user()); - $this->call('post', route('rule-groups.destroy', [1])); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - $this->assertRedirectedToRoute('index'); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleGroupController::down - */ - public function testDown() - { - $this->be($this->user()); - $this->call('get', route('rule-groups.down', [1])); - $this->assertResponseStatus(302); - $this->assertRedirectedToRoute('rules.index'); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleGroupController::edit - */ - public function testEdit() - { - $this->be($this->user()); - $this->call('get', route('rule-groups.edit', [1])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                                        '); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleGroupController::execute - */ - public function testExecute() - { - $this->session(['first' => new Carbon('2010-01-01')]); - $data = [ - 'accounts' => [1], - 'start_date' => '2010-01-02', - 'end_date' => '2010-01-02', - ]; - $this->be($this->user()); - $this->call('post', route('rule-groups.execute', [1]), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - $this->assertRedirectedToRoute('rules.index'); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleGroupController::selectTransactions - */ - public function testSelectTransactions() - { - $this->be($this->user()); - $this->call('get', route('rule-groups.select-transactions', [1])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                                          '); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleGroupController::store - */ - public function testStore() - { - $this->session(['rule-groups.create.url' => 'http://localhost']); - $data = [ - 'title' => 'A', - 'description' => '', - ]; - - $repository = $this->mock(RuleGroupRepositoryInterface::class); - $repository->shouldReceive('store')->andReturn(new RuleGroup); - $repository->shouldReceive('find')->andReturn(new RuleGroup); - - $this->be($this->user()); - $this->call('post', route('rule-groups.store', [1]), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleGroupController::up - */ - public function testUp() - { - $this->be($this->user()); - $this->call('get', route('rule-groups.up', [1])); - $this->assertResponseStatus(302); - $this->assertRedirectedToRoute('rules.index'); - } - - /** - * @covers \FireflyIII\Http\Controllers\RuleGroupController::update - */ - public function testUpdate() - { - $data = [ - 'title' => 'C', - 'description' => 'XX', - ]; - $this->session(['rule-groups.edit.url' => 'http://localhost']); - - $repository = $this->mock(RuleGroupRepositoryInterface::class); - $repository->shouldReceive('update'); - $repository->shouldReceive('find')->andReturn(new RuleGroup); - - $this->be($this->user()); - $this->call('post', route('rule-groups.update', [1]), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } -} diff --git a/tests/acceptance/Controllers/SearchControllerTest.php b/tests/acceptance/Controllers/SearchControllerTest.php deleted file mode 100644 index 68b1b97636..0000000000 --- a/tests/acceptance/Controllers/SearchControllerTest.php +++ /dev/null @@ -1,49 +0,0 @@ -mock(SearchInterface::class); - $search->shouldReceive('setLimit')->once(); - $search->shouldReceive('searchTransactions')->andReturn(new Collection)->withArgs([['test']])->once(); - $search->shouldReceive('searchBudgets')->andReturn(new Collection)->withArgs([['test']])->once(); - $search->shouldReceive('searchTags')->andReturn(new Collection)->withArgs([['test']])->once(); - $search->shouldReceive('searchCategories')->andReturn(new Collection)->withArgs([['test']])->once(); - $search->shouldReceive('searchAccounts')->andReturn(new Collection)->withArgs([['test']])->once(); - $this->be($this->user()); - $this->call('get', route('search.index') . '?q=test'); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                                            '); - } -} diff --git a/tests/acceptance/Controllers/TagControllerTest.php b/tests/acceptance/Controllers/TagControllerTest.php deleted file mode 100644 index 4a7717d528..0000000000 --- a/tests/acceptance/Controllers/TagControllerTest.php +++ /dev/null @@ -1,135 +0,0 @@ -be($this->user()); - $this->call('GET', route('tags.create')); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                                              '); - } - - /** - * @covers \FireflyIII\Http\Controllers\TagController::delete - */ - public function testDelete() - { - $this->be($this->user()); - $this->call('GET', route('tags.delete', [1])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                                                '); - } - - /** - * @covers \FireflyIII\Http\Controllers\TagController::destroy - */ - public function testDestroy() - { - $repository = $this->mock(TagRepositoryInterface::class); - $repository->shouldReceive('destroy'); - - $this->be($this->user()); - $this->call('post', route('tags.destroy', [1])); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\TagController::edit - */ - public function testEdit() - { - $this->be($this->user()); - $this->call('GET', route('tags.edit', [1])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                                                  '); - } - - /** - * @covers \FireflyIII\Http\Controllers\TagController::index - */ - public function testIndex() - { - $this->be($this->user()); - $this->call('GET', route('tags.index')); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                                                    '); - } - - /** - * @covers \FireflyIII\Http\Controllers\TagController::show - */ - public function testShow() - { - $this->be($this->user()); - $this->call('GET', route('tags.show', [1])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                                                      '); - } - - /** - * @covers \FireflyIII\Http\Controllers\TagController::store - */ - public function testStore() - { - $this->session(['tags.create.url' => 'http://localhost']); - $data = [ - 'tag' => 'Hello new tag' . rand(999, 10000), - 'tagMode' => 'nothing', - ]; - $this->be($this->user()); - $this->call('post', route('tags.store'), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\TagController::update - */ - public function testUpdate() - { - $this->session(['tags.edit.url' => 'http://localhost']); - $data = [ - 'tag' => 'Hello updated tag' . rand(999, 10000), - 'tagMode' => 'nothing', - ]; - $repository = $this->mock(TagRepositoryInterface::class); - $repository->shouldReceive('update'); - $repository->shouldReceive('find')->andReturn(new Tag); - - $this->be($this->user()); - $this->call('post', route('tags.update', [1]), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } -} diff --git a/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php b/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php deleted file mode 100644 index deab21f8d7..0000000000 --- a/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php +++ /dev/null @@ -1,121 +0,0 @@ -where('user_id', $this->user()->id)->first(); - - $this->be($this->user()); - $this->call('get', route('transactions.convert.index', ['transfer', $deposit->id])); - $this->assertResponseStatus(200); - $this->see('Convert a deposit into a transfer'); - } - - /** - * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index - */ - public function testIndexDepositWithdrawal() - { - $deposit = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->first(); - $this->be($this->user()); - $this->call('get', route('transactions.convert.index', ['withdrawal', $deposit->id])); - $this->assertResponseStatus(200); - $this->see('Convert a deposit into a withdrawal'); - } - - /** - * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index - */ - public function testIndexTransferDeposit() - { - $transfer = TransactionJournal::where('transaction_type_id', 3)->where('user_id', $this->user()->id)->first(); - $this->be($this->user()); - $this->call('get', route('transactions.convert.index', ['deposit', $transfer->id])); - $this->assertResponseStatus(200); - $this->see('Convert a transfer into a deposit'); - } - - /** - * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index - */ - public function testIndexTransferWithdrawal() - { - $transfer = TransactionJournal::where('transaction_type_id', 3)->where('user_id', $this->user()->id)->first(); - $this->be($this->user()); - $this->call('get', route('transactions.convert.index', ['withdrawal', $transfer->id])); - $this->assertResponseStatus(200); - $this->see('Convert a transfer into a withdrawal'); - } - - /** - * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index - */ - public function testIndexWithdrawalDeposit() - { - $withdrawal= TransactionJournal::where('transaction_type_id', 1)->where('user_id', $this->user()->id)->first(); - $this->be($this->user()); - $this->call('get', route('transactions.convert.index', ['deposit', $withdrawal->id])); - $this->assertResponseStatus(200); - $this->see('Convert a withdrawal into a deposit'); - } - - /** - * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index - */ - public function testIndexWithdrawalTransfer() - { - $withdrawal= TransactionJournal::where('transaction_type_id', 1)->where('user_id', $this->user()->id)->first(); - $this->be($this->user()); - $this->call('get', route('transactions.convert.index', ['transfer', $withdrawal->id])); - $this->assertResponseStatus(200); - $this->see('Convert a withdrawal into a transfer'); - } - - /** - * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::postIndex - */ - public function testPostIndex() - { - $withdrawal= TransactionJournal::where('transaction_type_id', 1)->where('user_id', $this->user()->id)->first(); - // convert a withdrawal to a transfer. Requires the ID of another asset account. - $data = [ - 'destination_account_asset' => 2, - ]; - $this->be($this->user()); - $this->call('post', route('transactions.convert.index', ['transfer', $withdrawal->id]), $data); - $this->assertResponseStatus(302); - $this->assertRedirectedToRoute('transactions.show', [$withdrawal->id]); - } -} diff --git a/tests/acceptance/Controllers/Transaction/MassControllerTest.php b/tests/acceptance/Controllers/Transaction/MassControllerTest.php deleted file mode 100644 index e6bf99179e..0000000000 --- a/tests/acceptance/Controllers/Transaction/MassControllerTest.php +++ /dev/null @@ -1,115 +0,0 @@ -where('user_id', $this->user()->id)->take(2)->get()->pluck('id')->toArray(); - $this->be($this->user()); - $this->call('get', route('transactions.mass.delete', $withdrawals)); - $this->assertResponseStatus(200); - $this->see('Delete a number of transactions'); - // has bread crumb - $this->see('
                                                                                                                                                                        '); - } - - /** - * @covers \FireflyIII\Http\Controllers\Transaction\MassController::destroy - */ - public function testDestroy() - { - $this->session(['transactions.mass-delete.url' => 'http://localhost']); - $deposits = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->take(2)->get()->pluck('id')->toArray(); - $data = [ - 'confirm_mass_delete' => $deposits, - ]; - $this->be($this->user()); - $this->call('post', route('transactions.mass.destroy'), $data); - $this->assertSessionHas('success'); - $this->assertResponseStatus(302); - - // visit them should give 404. - $this->call('get', route('transactions.show', [$deposits[0]])); - $this->assertResponseStatus(404); - - - } - - /** - * @covers \FireflyIII\Http\Controllers\Transaction\MassController::edit - */ - public function testEdit() - { - $transfers = TransactionJournal::where('transaction_type_id', 3)->where('user_id', $this->user()->id)->take(2)->get()->pluck('id')->toArray(); - $this->be($this->user()); - $this->call('get', route('transactions.mass.delete', $transfers)); - $this->assertResponseStatus(200); - $this->see('Edit a number of transactions'); - // has bread crumb - $this->see('
                                                                                                                                                                          '); - } - - /** - * @covers \FireflyIII\Http\Controllers\Transaction\MassController::update - */ - public function testUpdate() - { - $deposit = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id) - ->whereNull('deleted_at') - ->first(); - $this->session(['transactions.mass-edit.url' => 'http://localhost']); - - $data = [ - 'journals' => [$deposit->id], - 'description' => [$deposit->id => 'Updated salary thing'], - 'amount' => [$deposit->id => 1600], - 'amount_currency_id_amount_' . $deposit->id => 1, - 'date' => [$deposit->id => '2014-07-24'], - 'source_account_name' => [$deposit->id => 'Job'], - 'destination_account_id' => [$deposit->id => 1], - 'category' => [$deposit->id => 'Salary'], - ]; - - $this->be($this->user()); - $this->call('post', route('transactions.mass.update', [$deposit->id]), $data); - $this->assertSessionHas('success'); - $this->assertResponseStatus(302); - - // visit them should show updated content - $this->call('get', route('transactions.show', [$deposit->id])); - $this->assertResponseStatus(200); - $this->see('Updated salary thing'); - } - -} diff --git a/tests/acceptance/Controllers/Transaction/SingleControllerTest.php b/tests/acceptance/Controllers/Transaction/SingleControllerTest.php deleted file mode 100644 index 81e67a4e21..0000000000 --- a/tests/acceptance/Controllers/Transaction/SingleControllerTest.php +++ /dev/null @@ -1,141 +0,0 @@ -be($this->user()); - $this->call('get', route('transactions.create', ['withdrawal'])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                                                                                                                                            '); - } - - /** - * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::delete - */ - public function testDelete() - { - $this->be($this->user()); - $this->call('get', route('transactions.delete', [12])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                                                                                                                                              '); - } - - /** - * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::destroy - */ - public function testDestroy() - { - $this->session(['transactions.delete.url' => 'http://localhost']); - $this->be($this->user()); - - $repository = $this->mock(JournalRepositoryInterface::class); - $repository->shouldReceive('first')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('delete')->once(); - - $this->call('post', route('transactions.destroy', [13])); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::edit - */ - public function testEdit() - { - $this->be($this->user()); - $this->call('get', route('transactions.edit', [13])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                                                                                                                                                '); - } - - /** - * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::store - */ - public function testStore() - { - $this->session(['transactions.create.url' => 'http://localhost']); - $this->be($this->user()); - - $data = [ - 'what' => 'withdrawal', - 'amount' => '10', - 'amount_currency_id_amount' => 1, - 'source_account_id' => 1, - 'destination_account_name' => 'Some destination', - 'date' => '2016-01-01', - 'description' => 'Test descr', - ]; - $this->call('post', route('transactions.store', ['withdrawal']), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - } - - /** - * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::update - */ - public function testUpdate() - { - $this->session(['transactions.edit.url' => 'http://localhost']); - $this->be($this->user()); - $data = [ - 'id' => 123, - 'what' => 'withdrawal', - 'description' => 'Updated groceries', - 'source_account_id' => 1, - 'destination_account_name' => 'PLUS', - 'amount' => '123', - 'amount_currency_id_amount' => 1, - 'budget_id' => 1, - 'category' => 'Daily groceries', - 'tags' => '', - 'date' => '2016-01-01', - ]; - - $this->call('post', route('transactions.update', [123]), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - - $this->call('get', route('transactions.show', [123])); - $this->assertResponseStatus(200); - $this->see('Updated groceries'); - // has bread crumb - $this->see('
                                                                                                                                                                                  '); - - } -} diff --git a/tests/acceptance/Controllers/Transaction/SplitControllerTest.php b/tests/acceptance/Controllers/Transaction/SplitControllerTest.php deleted file mode 100644 index df52e7af6f..0000000000 --- a/tests/acceptance/Controllers/Transaction/SplitControllerTest.php +++ /dev/null @@ -1,86 +0,0 @@ -where('user_id', $this->user()->id)->first(); - $this->be($this->user()); - $this->call('get', route('transactions.split.edit', [$deposit->id])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                                                                                                                                                    '); - } - - /** - * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::update - * Implement testUpdate(). - */ - public function testUpdate() - { - $this->session(['transactions.edit-split.url' => 'http://localhost']); - $deposit = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->first(); - $data = [ - 'id' => $deposit->id, - 'what' => 'deposit', - 'journal_description' => 'Updated salary', - 'currency_id' => 1, - 'journal_destination_account_id' => 1, - 'journal_amount' => 1591, - 'date' => '2014-01-24', - 'tags' => '', - 'transactions' => [ - [ - 'description' => 'Split #1', - 'source_account_name' => 'Job', - 'amount' => 1591, - 'category' => '', - ], - ], - ]; - $this->be($this->user()); - $this->call('post', route('transactions.split.update', [$deposit->id]), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); - - // journal is updated? - $this->call('get', route('transactions.show', [$deposit->id])); - $this->assertResponseStatus(200); - $this->see('Updated salary'); - // has bread crumb - $this->see('
                                                                                                                                                                                      '); - } - -} diff --git a/tests/acceptance/Controllers/TransactionControllerTest.php b/tests/acceptance/Controllers/TransactionControllerTest.php deleted file mode 100644 index d5e596fd60..0000000000 --- a/tests/acceptance/Controllers/TransactionControllerTest.php +++ /dev/null @@ -1,89 +0,0 @@ -be($this->user()); - $this->call('get', route('transactions.index', ['transfer'])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                                                                                                                                                        '); - } - - /** - * @covers \FireflyIII\Http\Controllers\TransactionController::indexAll - */ - public function testIndexAll() - { - $this->be($this->user()); - $this->call('get', route('transactions.index.all', ['transfer'])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                                                                                                                                                          '); - } - - /** - * @covers \FireflyIII\Http\Controllers\TransactionController::indexByDate - */ - public function testIndexByDate() - { - $this->be($this->user()); - $this->call('get', route('transactions.index.date', ['transfer', '2016-01-01'])); - $this->assertResponseStatus(200); - // has bread crumb - $this->see('
                                                                                                                                                                                            '); - } - - /** - * @covers \FireflyIII\Http\Controllers\TransactionController::reorder - */ - public function testReorder() - { - $data = [ - 'items' => [], - ]; - $this->be($this->user()); - $this->call('post', route('transactions.reorder'), $data); - $this->assertResponseStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\TransactionController::show - */ - public function testShow() - { - $this->be($this->user()); - $this->call('get', route('transactions.show', [1])); - $this->assertResponseStatus(200); - $this->see('
                                                                                                                                                                                              '); - } -} diff --git a/tests/unit/Models/AccountTest.php b/tests/unit/Models/AccountTest.php deleted file mode 100644 index 6be272929b..0000000000 --- a/tests/unit/Models/AccountTest.php +++ /dev/null @@ -1,83 +0,0 @@ - 1, - 'name' => 'Test account #' . rand(1000, 9999), - ]; - $account = Account::firstOrCreateEncrypted($data); - - $this->assertEquals($account->user_id, $data['user_id']); - $this->assertEquals($account->name, $data['name']); - } - - /** - * @covers \FireflyIII\Models\Account::firstOrCreateEncrypted - */ - public function testEncryptedIban() - { - $data = [ - 'user_id' => 1, - 'iban' => 'NL64RABO0133183395', - ]; - $account = Account::firstOrCreateEncrypted($data); - - $this->assertEquals($account->user_id, $data['user_id']); - $this->assertEquals($account->name, $data['iban']); - } - - /** - * @covers \FireflyIII\Models\Account::firstOrCreateEncrypted - * @expectedException \FireflyIII\Exceptions\FireflyException - */ - public function testEncryptedNoId() - { - $data = [ - 'name' => 'Test account', - ]; - $account = Account::firstOrCreateEncrypted($data); - } - - /** - * @covers \FireflyIII\Models\Account::routeBinder - */ - public function testRouteBinder() - { - // not logged in? - $this->be($this->user()); - $this->call('get', route('accounts.show', [1])); - - } - - /** - * One that belongs to another user. - * - * @covers \FireflyIII\Models\Account::routeBinder - */ - public function testRouteBinderError() - { - $account = Account::whereUserId(3)->first(); - $this->be($this->user()); - $this->call('get', route('accounts.show', [$account->id])); - $this->assertResponseStatus(404); - } -} \ No newline at end of file diff --git a/tests/unit/Models/TransactionTypeTest.php b/tests/unit/Models/TransactionTypeTest.php deleted file mode 100644 index 51d8a1ea76..0000000000 --- a/tests/unit/Models/TransactionTypeTest.php +++ /dev/null @@ -1,56 +0,0 @@ -first(); - $this->assertTrue($transactionType->isDeposit()); - } - - /** - * @covers \FireflyIII\Models\TransactionType::isOpeningBalance - */ - public function testIsOpeningBalance() - { - $transactionType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first(); - $this->assertTrue($transactionType->isOpeningBalance()); - } - - /** - * @covers \FireflyIII\Models\TransactionType::isTransfer - */ - public function testIsTransfer() - { - $transactionType = TransactionType::whereType(TransactionType::TRANSFER)->first(); - $this->assertTrue($transactionType->isTransfer()); - } - - /** - * @covers \FireflyIII\Models\TransactionType::isWithdrawal - */ - public function testIsWithdrawal() - { - $transactionType = TransactionType::whereType(TransactionType::WITHDRAWAL)->first(); - $this->assertTrue($transactionType->isWithdrawal()); - } -} From 229f71875446e43eaed418fe3e629feed79ec6be Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 5 Feb 2017 15:41:41 +0100 Subject: [PATCH 034/276] Update Composer files. --- composer.json | 9 +++-- composer.lock | 96 ++++++++++++--------------------------------------- 2 files changed, 27 insertions(+), 78 deletions(-) diff --git a/composer.json b/composer.json index 4c1764d3c0..8e493a3031 100755 --- a/composer.json +++ b/composer.json @@ -68,8 +68,7 @@ "symfony/css-selector": "3.1.*", "symfony/dom-crawler": "3.1.*", "barryvdh/laravel-debugbar": "2.*", - "barryvdh/laravel-ide-helper": "2.*", - "johnkary/phpunit-speedtrap": "^1.0" + "barryvdh/laravel-ide-helper": "2.*" }, "autoload": { "classmap": [ @@ -80,9 +79,9 @@ } }, "autoload-dev": { - "classmap": [ - "tests/TestCase.php" - ] + "psr-4": { + "Tests\\": "tests/" + } }, "scripts": { "post-root-package-install": [ diff --git a/composer.lock b/composer.lock index 46a59ecc21..1c8211b043 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "485d633a8ac40b245a597a33fae7abf4", + "content-hash": "bccf2c2fdac584664dd6c952f1d91ba8", "packages": [ { "name": "bacon/bacon-qr-code", @@ -433,16 +433,16 @@ }, { "name": "doctrine/dbal", - "version": "v2.5.10", + "version": "v2.5.11", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "fc376f7a61498e18520cd6fa083752a4ca08072b" + "reference": "1b1effbddbdc0f40d1c8f849f44bcddac4f52a48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/fc376f7a61498e18520cd6fa083752a4ca08072b", - "reference": "fc376f7a61498e18520cd6fa083752a4ca08072b", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/1b1effbddbdc0f40d1c8f849f44bcddac4f52a48", + "reference": "1b1effbddbdc0f40d1c8f849f44bcddac4f52a48", "shasum": "" }, "require": { @@ -500,7 +500,7 @@ "persistence", "queryobject" ], - "time": "2017-01-23T23:17:10+00:00" + "time": "2017-02-04T21:20:13+00:00" }, { "name": "doctrine/inflector", @@ -667,16 +667,16 @@ }, { "name": "laravel/framework", - "version": "v5.4.6", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "5913b960656d7f978605ff9c1513ffbfd190c173" + "reference": "600330ae1d218919b3b307e0578461a2df248663" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/5913b960656d7f978605ff9c1513ffbfd190c173", - "reference": "5913b960656d7f978605ff9c1513ffbfd190c173", + "url": "https://api.github.com/repos/laravel/framework/zipball/600330ae1d218919b3b307e0578461a2df248663", + "reference": "600330ae1d218919b3b307e0578461a2df248663", "shasum": "" }, "require": { @@ -792,7 +792,7 @@ "framework", "laravel" ], - "time": "2017-01-27T19:27:15+00:00" + "time": "2017-02-03T19:47:35+00:00" }, { "name": "laravelcollective/html", @@ -976,16 +976,16 @@ }, { "name": "league/flysystem", - "version": "1.0.33", + "version": "1.0.34", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "5c7f98498b12d47f9de90ec9186a90000125777c" + "reference": "469ad53c13ea19a0e54e3e5d70f61227ddcc0299" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5c7f98498b12d47f9de90ec9186a90000125777c", - "reference": "5c7f98498b12d47f9de90ec9186a90000125777c", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/469ad53c13ea19a0e54e3e5d70f61227ddcc0299", + "reference": "469ad53c13ea19a0e54e3e5d70f61227ddcc0299", "shasum": "" }, "require": { @@ -1055,7 +1055,7 @@ "sftp", "storage" ], - "time": "2017-01-23T10:32:09+00:00" + "time": "2017-01-30T17:41:17+00:00" }, { "name": "monolog/monolog", @@ -2998,56 +2998,6 @@ ], "time": "2015-05-11T14:41:42+00:00" }, - { - "name": "johnkary/phpunit-speedtrap", - "version": "v1.0.1", - "source": { - "type": "git", - "url": "https://github.com/johnkary/phpunit-speedtrap.git", - "reference": "76a26f8a903a9434608cdad2b41c40cd134ea326" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/johnkary/phpunit-speedtrap/zipball/76a26f8a903a9434608cdad2b41c40cd134ea326", - "reference": "76a26f8a903a9434608cdad2b41c40cd134ea326", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "3.7.*|~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-0": { - "JohnKary": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "John Kary", - "email": "john@johnkary.net" - } - ], - "description": "Find slow tests in your PHPUnit test suite", - "homepage": "https://github.com/johnkary/phpunit-speedtrap", - "keywords": [ - "phpunit", - "profile", - "slow" - ], - "time": "2015-09-13T19:01:00+00:00" - }, { "name": "maximebf/debugbar", "version": "1.13.1", @@ -3671,16 +3621,16 @@ }, { "name": "phpunit/phpunit", - "version": "5.7.9", + "version": "5.7.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "69f832b87c731d5cacad7f91948778fe98335fdd" + "reference": "bf0804199f516fe80ffcc48ac6d4741c49baeb6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/69f832b87c731d5cacad7f91948778fe98335fdd", - "reference": "69f832b87c731d5cacad7f91948778fe98335fdd", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bf0804199f516fe80ffcc48ac6d4741c49baeb6e", + "reference": "bf0804199f516fe80ffcc48ac6d4741c49baeb6e", "shasum": "" }, "require": { @@ -3697,11 +3647,11 @@ "phpunit/php-text-template": "~1.2", "phpunit/php-timer": "^1.0.6", "phpunit/phpunit-mock-objects": "^3.2", - "sebastian/comparator": "~1.2.2", + "sebastian/comparator": "^1.2.4", "sebastian/diff": "~1.2", "sebastian/environment": "^1.3.4 || ^2.0", "sebastian/exporter": "~2.0", - "sebastian/global-state": "^1.0 || ^2.0", + "sebastian/global-state": "^1.1", "sebastian/object-enumerator": "~2.0", "sebastian/resource-operations": "~1.0", "sebastian/version": "~1.0|~2.0", @@ -3749,7 +3699,7 @@ "testing", "xunit" ], - "time": "2017-01-28T06:14:33+00:00" + "time": "2017-02-04T09:03:53+00:00" }, { "name": "phpunit/phpunit-mock-objects", From a9d5b6ef928895a0fa1b510595499323e7ac604c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 5 Feb 2017 15:42:00 +0100 Subject: [PATCH 035/276] Update to laravel 5.4 style tests --- tests/CreatesApplication.php | 22 +++++ tests/Feature/ExampleTest.php | 23 +++++ tests/TestCase.php | 154 ++-------------------------------- tests/Unit/ExampleTest.php | 20 +++++ 4 files changed, 73 insertions(+), 146 deletions(-) create mode 100644 tests/CreatesApplication.php create mode 100644 tests/Feature/ExampleTest.php create mode 100644 tests/Unit/ExampleTest.php diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php new file mode 100644 index 0000000000..8d8a77e99d --- /dev/null +++ b/tests/CreatesApplication.php @@ -0,0 +1,22 @@ +make(Kernel::class)->bootstrap(); + + return $app; + } +} \ No newline at end of file diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php new file mode 100644 index 0000000000..c23bfc63d5 --- /dev/null +++ b/tests/Feature/ExampleTest.php @@ -0,0 +1,23 @@ +get('/'); + + $response->assertStatus(200); + } +} \ No newline at end of file diff --git a/tests/TestCase.php b/tests/TestCase.php index c2a57c8e43..03cde96b56 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -1,153 +1,15 @@ id)->where('name', 'viewRange')->delete(); - Preference::create( - [ - 'user_id' => $user->id, - 'name' => 'viewRange', - 'data' => $range, - ] - ); - // set period to match? - - } - if ($range === 'custom') { - $this->session( - [ - 'start' => Carbon::now()->subDays(20), - 'end' => Carbon::now(), - ] - ); - } - } - - /** - * Creates the application. - * - * @return \Illuminate\Foundation\Application - */ - public function createApplication() - { - $app = require __DIR__ . '/../bootstrap/app.php'; - - $app->make(Illuminate\Contracts\Console\Kernel::class)->bootstrap(); - - return $app; - } - - /** - * @return array - */ - public function dateRangeProvider() - { - return [ - 'one day' => ['1D'], - 'one week' => ['1W'], - 'one month' => ['1M'], - 'three months' => ['3M'], - 'six months' => ['6M'], - 'one year' => ['1Y'], - 'custom range' => ['custom'], - ]; - } - - /** - * @return User - */ - public function emptyUser() - { - $user = User::find(2); - - return $user; - } - - /** - * @return array - */ - public function naughtyStringProvider() - { - /* - * If on Travis, return very small set. - */ - if (getenv('TRAVIS') == 'true') { - return [['Default value']]; - - } - $path = realpath(__DIR__ . '/../resources/tests/blns.base64.json'); - $content = file_get_contents($path); - $array = json_decode($content); - $return = []; - foreach ($array as $entry) { - $return[] = [base64_decode($entry)]; - } - - return $return; - } - - /** - * Sets up the fixture, for example, opens a network connection. - * This method is called before a test is executed. - */ - public function setUp() - { - parent::setUp(); - - } - - /** - * @return User - */ - public function user() - { - $user = User::find(1); - - return $user; - } - - /** - * @param string $class - * - * @return \Mockery\MockInterface - */ - protected function mock($class) - { - Log::debug(sprintf('Will now mock %s', $class)); - $object = Mockery::mock($class); - $this->app->instance($class, $object); - - return $object; - } -} + use CreatesApplication; +} \ No newline at end of file diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php new file mode 100644 index 0000000000..239346394a --- /dev/null +++ b/tests/Unit/ExampleTest.php @@ -0,0 +1,20 @@ +assertTrue(true); + } +} \ No newline at end of file From 3ff83cd4317de3ea9621b0f1eb920ecc3ace1b31 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 5 Feb 2017 15:43:56 +0100 Subject: [PATCH 036/276] Remove speed trap. --- phpunit.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/phpunit.xml b/phpunit.xml index d439428075..c096c7a945 100755 --- a/phpunit.xml +++ b/phpunit.xml @@ -17,11 +17,6 @@ ./tests/unit - - - - - ./app From 152fb3f885c8d207fe86583e66b073a8a24d2707 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 5 Feb 2017 15:58:27 +0100 Subject: [PATCH 037/276] Update the last providers. --- app/Providers/ExportJobServiceProvider.php | 18 +++++++++--------- app/Providers/RuleGroupServiceProvider.php | 2 +- app/Providers/RuleServiceProvider.php | 19 +++++++++---------- app/Providers/SearchServiceProvider.php | 18 +++++++++--------- app/Providers/TagServiceProvider.php | 19 ++++++++++--------- 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/app/Providers/ExportJobServiceProvider.php b/app/Providers/ExportJobServiceProvider.php index 7c12925df1..6850f417b5 100644 --- a/app/Providers/ExportJobServiceProvider.php +++ b/app/Providers/ExportJobServiceProvider.php @@ -14,9 +14,10 @@ declare(strict_types = 1); namespace FireflyIII\Providers; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\Repositories\ExportJob\ExportJobRepository; use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface; +use FireflyIII\Repositories\ImportJob\ImportJobRepository; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; @@ -72,16 +73,15 @@ class ExportJobServiceProvider extends ServiceProvider private function importJob() { $this->app->bind( - 'FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface', - function (Application $app, array $arguments) { - if (!isset($arguments[0]) && $app->auth->check()) { - return app('FireflyIII\Repositories\ImportJob\ImportJobRepository', [auth()->user()]); - } - if (!isset($arguments[0]) && !$app->auth->check()) { - throw new FireflyException('There is no user present.'); + ImportJobRepositoryInterface::class, + function (Application $app) { + /** @var ImportJobRepository $repository */ + $repository = app(ImportJobRepository::class); + if ($app->auth->check()) { + $repository->setUser(auth()->user()); } - return app('FireflyIII\Repositories\ImportJob\ImportJobRepository', $arguments); + return $repository; } ); } diff --git a/app/Providers/RuleGroupServiceProvider.php b/app/Providers/RuleGroupServiceProvider.php index c6b86c1604..0a3c8db599 100644 --- a/app/Providers/RuleGroupServiceProvider.php +++ b/app/Providers/RuleGroupServiceProvider.php @@ -46,7 +46,7 @@ class RuleGroupServiceProvider extends ServiceProvider { $this->app->bind( RuleGroupRepositoryInterface::class, - function (Application $app, array $arguments) { + function (Application $app) { /** @var RuleGroupRepository $repository */ $repository = app(RuleGroupRepository::class); if ($app->auth->check()) { diff --git a/app/Providers/RuleServiceProvider.php b/app/Providers/RuleServiceProvider.php index a395e8cda3..5d694411b3 100644 --- a/app/Providers/RuleServiceProvider.php +++ b/app/Providers/RuleServiceProvider.php @@ -14,7 +14,8 @@ declare(strict_types = 1); namespace FireflyIII\Providers; -use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Repositories\Rule\RuleRepository; +use FireflyIII\Repositories\Rule\RuleRepositoryInterface; use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; @@ -43,16 +44,14 @@ class RuleServiceProvider extends ServiceProvider public function register() { $this->app->bind( - 'FireflyIII\Repositories\Rule\RuleRepositoryInterface', - function (Application $app, array $arguments) { - if (!isset($arguments[0]) && $app->auth->check()) { - return app('FireflyIII\Repositories\Rule\RuleRepository', [auth()->user()]); + RuleRepositoryInterface::class, + function (Application $app) { + /** @var RuleRepository $repository */ + $repository = app(RuleRepository::class); + if ($app->auth->check()) { + $repository->setUser(auth()->user()); } - if (!isset($arguments[0]) && !$app->auth->check()) { - throw new FireflyException('There is no user present.'); - } - - return app('FireflyIII\Repositories\Rule\RuleRepository', $arguments); + return $repository; } ); } diff --git a/app/Providers/SearchServiceProvider.php b/app/Providers/SearchServiceProvider.php index a7be767e5e..18d5b48c6e 100644 --- a/app/Providers/SearchServiceProvider.php +++ b/app/Providers/SearchServiceProvider.php @@ -14,7 +14,8 @@ declare(strict_types = 1); namespace FireflyIII\Providers; -use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Support\Search\Search; +use FireflyIII\Support\Search\SearchInterface; use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; @@ -43,16 +44,15 @@ class SearchServiceProvider extends ServiceProvider public function register() { $this->app->bind( - 'FireflyIII\Support\Search\SearchInterface', - function (Application $app, array $arguments) { - if (!isset($arguments[0]) && $app->auth->check()) { - return app('FireflyIII\Support\Search\Search', [auth()->user()]); - } - if (!isset($arguments[0]) && !$app->auth->check()) { - throw new FireflyException('There is no user present.'); + SearchInterface::class, + function (Application $app) { + /** @var Search $search */ + $search = app(Search::class); + if ($app->auth->check()) { + $search->setUser(auth()->user()); } - return app('FireflyIII\Support\Search\Search', $arguments); + return $search; } ); } diff --git a/app/Providers/TagServiceProvider.php b/app/Providers/TagServiceProvider.php index 8889c9fbeb..b5daa36c6c 100644 --- a/app/Providers/TagServiceProvider.php +++ b/app/Providers/TagServiceProvider.php @@ -14,7 +14,8 @@ declare(strict_types = 1); namespace FireflyIII\Providers; -use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Repositories\Tag\TagRepository; +use FireflyIII\Repositories\Tag\TagRepositoryInterface; use Illuminate\Foundation\Application; use Illuminate\Support\ServiceProvider; @@ -43,16 +44,16 @@ class TagServiceProvider extends ServiceProvider public function register() { $this->app->bind( - 'FireflyIII\Repositories\Tag\TagRepositoryInterface', - function (Application $app, array $arguments) { - if (!isset($arguments[0]) && $app->auth->check()) { - return app('FireflyIII\Repositories\Tag\TagRepository', [auth()->user()]); - } - if (!isset($arguments[0]) && !$app->auth->check()) { - throw new FireflyException('There is no user present.'); + TagRepositoryInterface::class, + function (Application $app) { + /** @var TagRepository $repository */ + $repository = app(TagRepository::class); + + if ($app->auth->check()) { + $repository->setUser(auth()->user()); } - return app('FireflyIII\Repositories\Tag\TagRepository', $arguments); + return $repository; } ); } From 371ce37be4df0e941f03c009d52cb9bb41631241 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 5 Feb 2017 15:58:42 +0100 Subject: [PATCH 038/276] Update export classes --- app/Export/Exporter/BasicExporter.php | 16 +++++++++++----- app/Export/Exporter/CsvExporter.php | 8 ++------ app/Export/Exporter/ExporterInterface.php | 6 ++++++ app/Export/Processor.php | 13 ++++++++----- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/app/Export/Exporter/BasicExporter.php b/app/Export/Exporter/BasicExporter.php index b16b19776a..256fa3b544 100644 --- a/app/Export/Exporter/BasicExporter.php +++ b/app/Export/Exporter/BasicExporter.php @@ -26,17 +26,15 @@ class BasicExporter { /** @var ExportJob */ protected $job; - private $entries; + /** @var Collection */ + private $entries; /** * BasicExporter constructor. - * - * @param ExportJob $job */ - public function __construct(ExportJob $job) + public function __construct() { $this->entries = new Collection; - $this->job = $job; } /** @@ -55,5 +53,13 @@ class BasicExporter $this->entries = $entries; } + /** + * @param ExportJob $job + */ + public function setJob(ExportJob $job) + { + $this->job = $job; + } + } diff --git a/app/Export/Exporter/CsvExporter.php b/app/Export/Exporter/CsvExporter.php index b1f12f4e30..200bf8116d 100644 --- a/app/Export/Exporter/CsvExporter.php +++ b/app/Export/Exporter/CsvExporter.php @@ -14,7 +14,6 @@ declare(strict_types = 1); namespace FireflyIII\Export\Exporter; use FireflyIII\Export\Entry\Entry; -use FireflyIII\Models\ExportJob; use League\Csv\Writer; use SplFileObject; @@ -30,13 +29,10 @@ class CsvExporter extends BasicExporter implements ExporterInterface /** * CsvExporter constructor. - * - * @param ExportJob $job */ - public function __construct(ExportJob $job) + public function __construct() { - parent::__construct($job); - + parent::__construct(); } /** diff --git a/app/Export/Exporter/ExporterInterface.php b/app/Export/Exporter/ExporterInterface.php index 3559d89cec..9e267b4812 100644 --- a/app/Export/Exporter/ExporterInterface.php +++ b/app/Export/Exporter/ExporterInterface.php @@ -13,6 +13,7 @@ declare(strict_types = 1); namespace FireflyIII\Export\Exporter; +use FireflyIII\Models\ExportJob; use Illuminate\Support\Collection; /** @@ -45,4 +46,9 @@ interface ExporterInterface */ public function setEntries(Collection $entries); + /** + * @param ExportJob $job + */ + public function setJob(ExportJob $job); + } diff --git a/app/Export/Processor.php b/app/Export/Processor.php index 0d0421a460..90ff2d8692 100644 --- a/app/Export/Processor.php +++ b/app/Export/Processor.php @@ -19,7 +19,6 @@ use FireflyIII\Export\Collector\JournalExportCollector; use FireflyIII\Export\Collector\UploadCollector; use FireflyIII\Export\Entry\Entry; use FireflyIII\Models\ExportJob; -use Illuminate\Filesystem\FilesystemAdapter; use Illuminate\Support\Collection; use Log; use Storage; @@ -78,7 +77,8 @@ class Processor implements ProcessorInterface public function collectAttachments(): bool { /** @var AttachmentCollector $attachmentCollector */ - $attachmentCollector = app(AttachmentCollector::class, [$this->job]); + $attachmentCollector = app(AttachmentCollector::class); + $attachmentCollector->setJob($this->job); $attachmentCollector->setDates($this->settings['startDate'], $this->settings['endDate']); $attachmentCollector->run(); $this->files = $this->files->merge($attachmentCollector->getEntries()); @@ -92,7 +92,8 @@ class Processor implements ProcessorInterface public function collectJournals(): bool { /** @var JournalExportCollector $collector */ - $collector = app(JournalExportCollector::class, [$this->job]); + $collector = app(JournalExportCollector::class); + $collector->setJob($this->job); $collector->setDates($this->settings['startDate'], $this->settings['endDate']); $collector->setAccounts($this->settings['accounts']); $collector->run(); @@ -108,7 +109,8 @@ class Processor implements ProcessorInterface public function collectOldUploads(): bool { /** @var UploadCollector $uploadCollector */ - $uploadCollector = app(UploadCollector::class, [$this->job]); + $uploadCollector = app(UploadCollector::class); + $uploadCollector->setJob($this->job); $uploadCollector->run(); $this->files = $this->files->merge($uploadCollector->getEntries()); @@ -166,7 +168,8 @@ class Processor implements ProcessorInterface public function exportJournals(): bool { $exporterClass = config('firefly.export_formats.' . $this->exportFormat); - $exporter = app($exporterClass, [$this->job]); + $exporter = app($exporterClass); + $exporter->setJob($this->job); $exporter->setEntries($this->exportEntries); $exporter->run(); $this->files->push($exporter->getFileName()); From 704c0922e863a9da5c8299cf5de53cd319888547 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 5 Feb 2017 15:58:55 +0100 Subject: [PATCH 039/276] Update collector classes --- app/Export/Collector/AttachmentCollector.php | 6 ++---- app/Export/Collector/BasicCollector.php | 13 +++++++++---- app/Export/Collector/CollectorInterface.php | 8 ++++++++ app/Export/Collector/UploadCollector.php | 20 +++++++------------- 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/app/Export/Collector/AttachmentCollector.php b/app/Export/Collector/AttachmentCollector.php index e068f32585..810dc1db85 100644 --- a/app/Export/Collector/AttachmentCollector.php +++ b/app/Export/Collector/AttachmentCollector.php @@ -43,10 +43,8 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface /** * AttachmentCollector constructor. - * - * @param ExportJob $job */ - public function __construct(ExportJob $job) + public function __construct() { /** @var AttachmentRepositoryInterface repository */ $this->repository = app(AttachmentRepositoryInterface::class); @@ -54,7 +52,7 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface $this->uploadDisk = Storage::disk('upload'); $this->exportDisk = Storage::disk('export'); - parent::__construct($job); + parent::__construct(); } /** diff --git a/app/Export/Collector/BasicCollector.php b/app/Export/Collector/BasicCollector.php index 4fd571c84d..c80e8ec280 100644 --- a/app/Export/Collector/BasicCollector.php +++ b/app/Export/Collector/BasicCollector.php @@ -31,13 +31,10 @@ class BasicCollector /** * BasicCollector constructor. - * - * @param ExportJob $job */ - public function __construct(ExportJob $job) + public function __construct() { $this->entries = new Collection; - $this->job = $job; } /** @@ -56,5 +53,13 @@ class BasicCollector $this->entries = $entries; } + /** + * @param ExportJob $job + */ + public function setJob(ExportJob $job) + { + $this->job = $job; + } + } diff --git a/app/Export/Collector/CollectorInterface.php b/app/Export/Collector/CollectorInterface.php index f1778e9adc..54a3fa88a1 100644 --- a/app/Export/Collector/CollectorInterface.php +++ b/app/Export/Collector/CollectorInterface.php @@ -13,6 +13,7 @@ declare(strict_types = 1); namespace FireflyIII\Export\Collector; +use FireflyIII\Models\ExportJob; use Illuminate\Support\Collection; /** @@ -32,6 +33,13 @@ interface CollectorInterface */ public function run(): bool; + /** + * @param ExportJob $job + * + * @return mixed + */ + public function setJob(ExportJob $job); + /** * @param Collection $entries * diff --git a/app/Export/Collector/UploadCollector.php b/app/Export/Collector/UploadCollector.php index 1895cb8a5e..35c2e75188 100644 --- a/app/Export/Collector/UploadCollector.php +++ b/app/Export/Collector/UploadCollector.php @@ -14,7 +14,6 @@ declare(strict_types = 1); namespace FireflyIII\Export\Collector; use Crypt; -use FireflyIII\Models\ExportJob; use Illuminate\Contracts\Encryption\DecryptException; use Log; use Storage; @@ -35,22 +34,12 @@ class UploadCollector extends BasicCollector implements CollectorInterface /** * AttachmentCollector constructor. - * - * @param ExportJob $job */ - public function __construct(ExportJob $job) + public function __construct() { - parent::__construct($job); - - Log::debug('Going to collect attachments', ['key' => $job->key]); - - // make storage: + parent::__construct(); $this->uploadDisk = Storage::disk('upload'); $this->exportDisk = Storage::disk('export'); - - // file names associated with the old import routine. - $this->vintageFormat = sprintf('csv-upload-%d-', auth()->user()->id); - } /** @@ -60,6 +49,11 @@ class UploadCollector extends BasicCollector implements CollectorInterface */ public function run(): bool { + Log::debug('Going to collect attachments', ['key' => $this->job->key]); + + // file names associated with the old import routine. + $this->vintageFormat = sprintf('csv-upload-%d-', $this->job->user->id); + // collect old upload files (names beginning with "csv-upload". $this->collectVintageUploads(); From 77e52f42a6dd1d21b38979babe9a94bdd43437bd Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 5 Feb 2017 16:14:23 +0100 Subject: [PATCH 040/276] Update export routine. --- app/Export/Processor.php | 31 ++++++++++++++++++------------- app/Export/ProcessorInterface.php | 10 ++++++---- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/app/Export/Processor.php b/app/Export/Processor.php index 90ff2d8692..cbbdd2736b 100644 --- a/app/Export/Processor.php +++ b/app/Export/Processor.php @@ -53,21 +53,12 @@ class Processor implements ProcessorInterface /** * Processor constructor. - * - * @param array $settings */ - public function __construct(array $settings) + public function __construct() { - // save settings - $this->settings = $settings; - $this->accounts = $settings['accounts']; - $this->exportFormat = $settings['exportFormat']; - $this->includeAttachments = $settings['includeAttachments']; - $this->includeOldUploads = $settings['includeOldUploads']; - $this->job = $settings['job']; - $this->journals = new Collection; - $this->exportEntries = new Collection; - $this->files = new Collection; + $this->journals = new Collection; + $this->exportEntries = new Collection; + $this->files = new Collection; } @@ -185,6 +176,20 @@ class Processor implements ProcessorInterface return $this->files; } + /** + * @param array $settings + */ + public function setSettings(array $settings) + { + // save settings + $this->settings = $settings; + $this->accounts = $settings['accounts']; + $this->exportFormat = $settings['exportFormat']; + $this->includeAttachments = $settings['includeAttachments']; + $this->includeOldUploads = $settings['includeOldUploads']; + $this->job = $settings['job']; + } + /** * */ diff --git a/app/Export/ProcessorInterface.php b/app/Export/ProcessorInterface.php index 614d748304..540dbcaf37 100644 --- a/app/Export/ProcessorInterface.php +++ b/app/Export/ProcessorInterface.php @@ -25,11 +25,8 @@ interface ProcessorInterface /** * Processor constructor. - * - * @param array $settings - * */ - public function __construct(array $settings); + public function __construct(); /** * @return bool @@ -65,4 +62,9 @@ interface ProcessorInterface * @return Collection */ public function getFiles(): Collection; + + /** + * @param array $settings + */ + public function setSettings(array $settings); } From 8a98204a69acd1eb8acfc78178fed9435e5ba272 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 5 Feb 2017 16:16:15 +0100 Subject: [PATCH 041/276] Update app() calls --- app/Console/Commands/CreateImport.php | 3 +- .../Report/Audit/MonthReportGenerator.php | 3 +- .../Report/Budget/MonthReportGenerator.php | 3 +- .../Report/Category/MonthReportGenerator.php | 6 ++-- app/Helpers/Chart/MetaPieChart.php | 12 ++++--- app/Helpers/Collector/JournalCollector.php | 3 +- app/Helpers/Report/ReportHelper.php | 3 +- app/Http/Controllers/AccountController.php | 35 ++++++++++--------- app/Http/Controllers/BillController.php | 3 +- app/Http/Controllers/BudgetController.php | 9 +++-- app/Http/Controllers/CategoryController.php | 3 +- .../Controllers/Chart/BudgetController.php | 3 +- .../Chart/BudgetReportController.php | 3 +- .../Chart/CategoryReportController.php | 6 ++-- app/Http/Controllers/ExportController.php | 3 +- .../Controllers/Popup/ReportController.php | 21 +++++++---- app/Http/Controllers/RuleController.php | 4 +-- .../Controllers/TransactionController.php | 9 +++-- app/Http/Requests/RuleGroupFormRequest.php | 3 +- app/Import/Converter/AccountId.php | 3 +- app/Import/Converter/AssetAccountIban.php | 3 +- app/Import/Converter/AssetAccountName.php | 3 +- app/Import/Converter/AssetAccountNumber.php | 3 +- app/Import/Converter/BillId.php | 3 +- app/Import/Converter/BillName.php | 3 +- app/Import/Converter/BudgetId.php | 3 +- app/Import/Converter/BudgetName.php | 3 +- app/Import/Converter/CategoryId.php | 3 +- app/Import/Converter/CategoryName.php | 3 +- app/Import/Converter/CurrencyCode.php | 1 + app/Import/Converter/CurrencyId.php | 3 +- app/Import/Converter/CurrencyName.php | 3 +- app/Import/Converter/CurrencySymbol.php | 3 +- app/Import/Converter/OpposingAccountIban.php | 3 +- app/Import/Converter/OpposingAccountName.php | 3 +- .../Converter/OpposingAccountNumber.php | 3 +- app/Import/Converter/TagSplit.php | 3 +- app/Import/ImportProcedure.php | 3 +- app/Import/ImportStorage.php | 3 +- app/Import/ImportValidator.php | 12 ++++--- app/Import/Setup/CsvSetup.php | 3 +- ...ExecuteRuleGroupOnExistingTransactions.php | 3 +- app/Repositories/Budget/BudgetRepository.php | 6 ++-- .../Category/CategoryRepository.php | 9 +++-- app/Repositories/Tag/TagRepository.php | 6 ++-- app/Rules/Actions/SetBudget.php | 3 +- app/Rules/Actions/SetDestinationAccount.php | 3 +- app/Rules/Actions/SetSourceAccount.php | 3 +- app/Rules/TransactionMatcher.php | 3 +- app/Support/Search/Search.php | 23 ++++++------ app/Support/Search/SearchInterface.php | 6 ++++ 51 files changed, 174 insertions(+), 99 deletions(-) diff --git a/app/Console/Commands/CreateImport.php b/app/Console/Commands/CreateImport.php index 41fd83d762..00ff5094c6 100644 --- a/app/Console/Commands/CreateImport.php +++ b/app/Console/Commands/CreateImport.php @@ -79,7 +79,8 @@ class CreateImport extends Command $this->info(sprintf('Type of import: %s', $type)); /** @var ImportJobRepositoryInterface $jobRepository */ - $jobRepository = app(ImportJobRepositoryInterface::class, [$user]); + $jobRepository = app(ImportJobRepositoryInterface::class); + $jobRepository->setUser($user); $job = $jobRepository->create($type); $this->line(sprintf('Created job "%s"...', $job->key)); diff --git a/app/Generator/Report/Audit/MonthReportGenerator.php b/app/Generator/Report/Audit/MonthReportGenerator.php index 9c21b1a0ba..02cc9d08c2 100644 --- a/app/Generator/Report/Audit/MonthReportGenerator.php +++ b/app/Generator/Report/Audit/MonthReportGenerator.php @@ -139,7 +139,8 @@ class MonthReportGenerator implements ReportGeneratorInterface { /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end); $journals = $collector->getJournals(); $journals = $journals->reverse(); diff --git a/app/Generator/Report/Budget/MonthReportGenerator.php b/app/Generator/Report/Budget/MonthReportGenerator.php index 38a53aad79..3ab5227ecc 100644 --- a/app/Generator/Report/Budget/MonthReportGenerator.php +++ b/app/Generator/Report/Budget/MonthReportGenerator.php @@ -185,7 +185,8 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface } /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAccounts($this->accounts)->setRange($this->start, $this->end) ->setTypes([TransactionType::WITHDRAWAL]) ->setBudgets($this->budgets)->withOpposingAccount()->disableFilter(); diff --git a/app/Generator/Report/Category/MonthReportGenerator.php b/app/Generator/Report/Category/MonthReportGenerator.php index 5517d7be13..865121006e 100644 --- a/app/Generator/Report/Category/MonthReportGenerator.php +++ b/app/Generator/Report/Category/MonthReportGenerator.php @@ -195,7 +195,8 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface } /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAccounts($this->accounts)->setRange($this->start, $this->end) ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) ->setCategories($this->categories)->withOpposingAccount()->disableFilter(); @@ -218,7 +219,8 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface } /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAccounts($this->accounts)->setRange($this->start, $this->end) ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) ->setCategories($this->categories)->withOpposingAccount(); diff --git a/app/Helpers/Chart/MetaPieChart.php b/app/Helpers/Chart/MetaPieChart.php index fbeb70cc25..e83b103ba0 100644 --- a/app/Helpers/Chart/MetaPieChart.php +++ b/app/Helpers/Chart/MetaPieChart.php @@ -85,7 +85,8 @@ class MetaPieChart implements MetaPieChartInterface // also collect all other transactions if ($this->collectOtherObjects && $direction === 'expense') { /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [$this->user]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser($this->user); $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)->setTypes([TransactionType::WITHDRAWAL]); $journals = $collector->getJournals(); $sum = strval($journals->sum('transaction_amount')); @@ -96,7 +97,8 @@ class MetaPieChart implements MetaPieChartInterface if ($this->collectOtherObjects && $direction === 'income') { /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)->setTypes([TransactionType::DEPOSIT]); $journals = $collector->getJournals(); $sum = strval($journals->sum('transaction_amount')); @@ -201,7 +203,8 @@ class MetaPieChart implements MetaPieChartInterface $modifier = 1; } /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAccounts($this->accounts); $collector->setRange($this->start, $this->end); $collector->setTypes($types); @@ -258,7 +261,8 @@ class MetaPieChart implements MetaPieChartInterface { $chartData = []; $names = []; - $repository = app($this->repositories[$type], [$this->user]); + $repository = app($this->repositories[$type]); + $repository->setUser($this->user); foreach ($array as $objectId => $amount) { if (!isset($names[$objectId])) { $object = $repository->find(intval($objectId)); diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php index 7952ed2e2f..6e2d7a0d8e 100644 --- a/app/Helpers/Collector/JournalCollector.php +++ b/app/Helpers/Collector/JournalCollector.php @@ -233,7 +233,8 @@ class JournalCollector implements JournalCollectorInterface public function setAllAssetAccounts(): JournalCollectorInterface { /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class, [$this->user]); + $repository = app(AccountRepositoryInterface::class); + $repository->setUser($this->user); $accounts = $repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT]); if ($accounts->count() > 0) { $accountIds = $accounts->pluck('id')->toArray(); diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php index 40b7b68eaf..f49805cd1b 100644 --- a/app/Helpers/Report/ReportHelper.php +++ b/app/Helpers/Report/ReportHelper.php @@ -68,7 +68,8 @@ class ReportHelper implements ReportHelperInterface /** @var BillRepositoryInterface $repository */ $repository = app(BillRepositoryInterface::class); $bills = $repository->getBillsForAccounts($accounts); - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAccounts($accounts)->setRange($start, $end)->setBills($bills); $journals = $collector->getJournals(); $collection = new BillCollection; diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index b3b007cb9e..92d06ece6f 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -23,7 +23,6 @@ use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\Transaction; use FireflyIII\Repositories\Account\AccountRepositoryInterface; -use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI; use FireflyIII\Repositories\Account\AccountTaskerInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Support\CacheProperties; @@ -97,12 +96,12 @@ class AccountController extends Controller } /** - * @param ARI $repository - * @param Account $account + * @param AccountRepositoryInterface $repository + * @param Account $account * * @return View */ - public function delete(ARI $repository, Account $account) + public function delete(AccountRepositoryInterface $repository, Account $account) { $typeName = config('firefly.shortNamesByFullName.' . $account->accountType->type); $subTitle = trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]); @@ -119,12 +118,12 @@ class AccountController extends Controller /** * @param Request $request - * @param ARI $repository + * @param AccountRepositoryInterface $repository * @param Account $account * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function destroy(Request $request, ARI $repository, Account $account) + public function destroy(Request $request, AccountRepositoryInterface $repository, Account $account) { $type = $account->accountType->type; $typeName = config('firefly.shortNamesByFullName.' . $type); @@ -199,12 +198,12 @@ class AccountController extends Controller } /** - * @param ARI $repository + * @param AccountRepositoryInterface $repository * @param string $what * * @return View */ - public function index(ARI $repository, string $what) + public function index(AccountRepositoryInterface $repository, string $what) { $what = $what ?? 'asset'; $subTitle = trans('firefly.' . $what . '_accounts'); @@ -270,7 +269,7 @@ class AccountController extends Controller /** * @param Request $request - * @param ARI $repository + * @param AccountRepositoryInterface $repository * @param Account $account * * @return View @@ -284,7 +283,8 @@ class AccountController extends Controller // replace with journal collector: /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page); $journals = $collector->getPaginatedJournals(); $journals->setPath('accounts/show/' . $account->id . '/all'); @@ -318,7 +318,8 @@ class AccountController extends Controller // replace with journal collector: /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->setLimit($pageSize)->setPage($page); $journals = $collector->getPaginatedJournals(); $journals->setPath('accounts/show/' . $account->id . '/' . $date); @@ -332,12 +333,12 @@ class AccountController extends Controller /** * @param AccountFormRequest $request - * @param ARI $repository + * @param AccountRepositoryInterface $repository * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * */ - public function store(AccountFormRequest $request, ARI $repository) + public function store(AccountFormRequest $request, AccountRepositoryInterface $repository) { $data = $request->getAccountData(); $account = $repository->store($data); @@ -365,12 +366,12 @@ class AccountController extends Controller /** * @param AccountFormRequest $request - * @param ARI $repository + * @param AccountRepositoryInterface $repository * @param Account $account * * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function update(AccountFormRequest $request, ARI $repository, Account $account) + public function update(AccountFormRequest $request, AccountRepositoryInterface $repository, Account $account) { $data = $request->getAccountData(); $repository->update($account, $data); @@ -417,8 +418,8 @@ class AccountController extends Controller */ private function periodEntries(Account $account): Collection { - /** @var ARI $repository */ - $repository = app(ARI::class); + /** @var AccountRepositoryInterface $repository */ + $repository = app(AccountRepositoryInterface::class); /** @var AccountTaskerInterface $tasker */ $tasker = app(AccountTaskerInterface::class); diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index 0642dd260b..913ac09208 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -215,7 +215,8 @@ class BillController extends Controller // use collector: /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAllAssetAccounts()->setBills(new Collection([$bill]))->setLimit($pageSize)->setPage($page)->withBudgetInformation() ->withCategoryInformation(); $journals = $collector->getPaginatedJournals(); diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 0d8ce65937..aaf56a50ec 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -212,7 +212,8 @@ class BudgetController extends Controller // collector /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutBudget(); $journals = $collector->getPaginatedJournals(); $journals->setPath('/budgets/list/noBudget'); @@ -253,7 +254,8 @@ class BudgetController extends Controller $repetition = null; // collector: /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAllAssetAccounts()->setRange($start, $end)->setBudget($budget)->setLimit($pageSize)->setPage($page)->withCategoryInformation(); $journals = $collector->getPaginatedJournals(); $journals->setPath('/budgets/show/' . $budget->id); @@ -290,7 +292,8 @@ class BudgetController extends Controller // collector: /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAllAssetAccounts()->setRange($budgetLimit->start_date, $budgetLimit->end_date) ->setBudget($budget)->setLimit($pageSize)->setPage($page)->withCategoryInformation(); $journals = $collector->getPaginatedJournals(); diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 2a52505818..81f1e230d9 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -165,7 +165,8 @@ class CategoryController extends Controller // new collector: /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAllAssetAccounts()->setRange($start, $end)->withoutCategory();//->groupJournals(); $journals = $collector->getJournals(); $subTitle = trans( diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index 0a8fe543cf..2c792fa908 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -416,7 +416,8 @@ class BudgetController extends Controller { // collector /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $types = [TransactionType::WITHDRAWAL]; $collector->setAllAssetAccounts()->setTypes($types)->setRange($start, $end)->withoutBudget(); $journals = $collector->getJournals(); diff --git a/app/Http/Controllers/Chart/BudgetReportController.php b/app/Http/Controllers/Chart/BudgetReportController.php index d131f8a661..b5ab26355c 100644 --- a/app/Http/Controllers/Chart/BudgetReportController.php +++ b/app/Http/Controllers/Chart/BudgetReportController.php @@ -239,7 +239,8 @@ class BudgetReportController extends Controller private function getExpenses(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end): Collection { /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) ->setBudgets($budgets)->withOpposingAccount()->disableFilter(); $accountIds = $accounts->pluck('id')->toArray(); diff --git a/app/Http/Controllers/Chart/CategoryReportController.php b/app/Http/Controllers/Chart/CategoryReportController.php index e156becd7e..0cd50c308c 100644 --- a/app/Http/Controllers/Chart/CategoryReportController.php +++ b/app/Http/Controllers/Chart/CategoryReportController.php @@ -284,7 +284,8 @@ class CategoryReportController extends Controller private function getExpenses(Collection $accounts, Collection $categories, Carbon $start, Carbon $end): Collection { /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) ->setCategories($categories)->withOpposingAccount()->disableFilter(); $accountIds = $accounts->pluck('id')->toArray(); @@ -305,7 +306,8 @@ class CategoryReportController extends Controller private function getIncome(Collection $accounts, Collection $categories, Carbon $start, Carbon $end): Collection { /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) ->setCategories($categories)->withOpposingAccount(); $accountIds = $accounts->pluck('id')->toArray(); diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php index 1ace8118c1..823c82e928 100644 --- a/app/Http/Controllers/ExportController.php +++ b/app/Http/Controllers/ExportController.php @@ -150,7 +150,8 @@ class ExportController extends Controller $jobs->changeStatus($job, 'export_status_make_exporter'); /** @var ProcessorInterface $processor */ - $processor = app(ProcessorInterface::class, [$settings]); + $processor = app(ProcessorInterface::class); + $processor->setSettings($settings); /* * Collect journals: diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index 0f436dc962..7bd8803fa5 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -103,7 +103,8 @@ class ReportController extends Controller switch (true) { case ($role === BalanceLine::ROLE_DEFAULTROLE && !is_null($budget->id)): /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector ->setAccounts(new Collection([$account])) ->setRange($attributes['startDate'], $attributes['endDate']) @@ -114,7 +115,8 @@ class ReportController extends Controller case ($role === BalanceLine::ROLE_DEFAULTROLE && is_null($budget->id)): $budget->name = strval(trans('firefly.no_budget')); /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector ->setAccounts(new Collection([$account])) ->setTypes($types) @@ -124,7 +126,8 @@ class ReportController extends Controller break; case ($role === BalanceLine::ROLE_DIFFROLE): /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector ->setAccounts(new Collection([$account])) ->setTypes($types) @@ -169,7 +172,8 @@ class ReportController extends Controller $repository = app(BudgetRepositoryInterface::class); $budget = $repository->find(intval($attributes['budgetId'])); /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector ->setAccounts($attributes['accounts']) @@ -203,7 +207,8 @@ class ReportController extends Controller $category = $repository->find(intval($attributes['categoryId'])); $types = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER]; /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAccounts($attributes['accounts'])->setTypes($types) ->setRange($attributes['startDate'], $attributes['endDate']) ->setCategory($category); @@ -230,7 +235,8 @@ class ReportController extends Controller $account = $repository->find(intval($attributes['accountId'])); $types = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER]; /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate'])->setTypes($types); $journals = $collector->getJournals(); $report = $attributes['accounts']->pluck('id')->toArray(); // accounts used in this report @@ -266,7 +272,8 @@ class ReportController extends Controller $account = $repository->find(intval($attributes['accountId'])); $types = [TransactionType::DEPOSIT, TransactionType::TRANSFER]; /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate'])->setTypes($types); $journals = $collector->getJournals(); $report = $attributes['accounts']->pluck('id')->toArray(); // accounts used in this report diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index 8e0e466933..1d6663835a 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -293,7 +293,7 @@ class RuleController extends Controller $range = config('firefly.test-triggers.range'); /** @var TransactionMatcher $matcher */ - $matcher = app('FireflyIII\Rules\TransactionMatcher'); + $matcher = app(TransactionMatcher::class); $matcher->setLimit($limit); $matcher->setRange($range); $matcher->setTriggers($triggers); @@ -357,7 +357,7 @@ class RuleController extends Controller private function createDefaultRule() { /** @var RuleRepositoryInterface $repository */ - $repository = app('FireflyIII\Repositories\Rule\RuleRepositoryInterface'); + $repository = app(RuleRepositoryInterface::class); if ($repository->count() === 0) { $data = [ diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 2ec3e8ce5c..ba38605b8f 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -72,7 +72,8 @@ class TransactionController extends Controller $end = session('end', Navigation::endOfPeriod(new Carbon, $range)); /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setTypes($types)->setLimit($pageSize)->setPage($page)->setAllAssetAccounts(); $collector->setRange($start, $end)->withBudgetInformation()->withCategoryInformation(); @@ -122,7 +123,8 @@ class TransactionController extends Controller $subTitle = sprintf('%s (%s)', trans('firefly.title_' . $what), strtolower(trans('firefly.everything'))); $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setTypes($types)->setLimit($pageSize)->setPage($page)->setAllAssetAccounts()->withBudgetInformation()->withCategoryInformation(); // do not filter transfers if $what = transfer. @@ -161,7 +163,8 @@ class TransactionController extends Controller Log::debug(sprintf('Transaction index by date will show between %s and %s', $start->format('Y-m-d'), $end->format('Y-m-d'))); /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setTypes($types)->setLimit($pageSize)->setPage($page)->setAllAssetAccounts(); $collector->setRange($start, $end)->withBudgetInformation()->withCategoryInformation(); diff --git a/app/Http/Requests/RuleGroupFormRequest.php b/app/Http/Requests/RuleGroupFormRequest.php index fcf92d0105..b5917242d7 100644 --- a/app/Http/Requests/RuleGroupFormRequest.php +++ b/app/Http/Requests/RuleGroupFormRequest.php @@ -49,7 +49,8 @@ class RuleGroupFormRequest extends Request public function rules() { /** @var RuleGroupRepositoryInterface $repository */ - $repository = app(RuleGroupRepositoryInterface::class, [auth()->user()]); + $repository = app(RuleGroupRepositoryInterface::class); + $repository->setUser(auth()->user()); $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title'; if (!is_null($repository->find(intval($this->get('id')))->id)) { $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title,' . intval($this->get('id')); diff --git a/app/Import/Converter/AccountId.php b/app/Import/Converter/AccountId.php index 5b39999f2e..4c07790fa5 100644 --- a/app/Import/Converter/AccountId.php +++ b/app/Import/Converter/AccountId.php @@ -40,7 +40,8 @@ class AccountId extends BasicConverter implements ConverterInterface return new Account; } /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class, [$this->user]); + $repository = app(AccountRepositoryInterface::class); + $repository->setUser($this->user); if (isset($this->mapping[$value])) { Log::debug('Found account in mapping. Should exist.', ['value' => $value, 'map' => $this->mapping[$value]]); diff --git a/app/Import/Converter/AssetAccountIban.php b/app/Import/Converter/AssetAccountIban.php index 9ed749a781..d2336c282d 100644 --- a/app/Import/Converter/AssetAccountIban.php +++ b/app/Import/Converter/AssetAccountIban.php @@ -43,7 +43,8 @@ class AssetAccountIban extends BasicConverter implements ConverterInterface } /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class, [$this->user]); + $repository = app(AccountRepositoryInterface::class); + $repository->setUser($this->user); if (isset($this->mapping[$value])) { diff --git a/app/Import/Converter/AssetAccountName.php b/app/Import/Converter/AssetAccountName.php index 4785ae16d2..8618d52f2d 100644 --- a/app/Import/Converter/AssetAccountName.php +++ b/app/Import/Converter/AssetAccountName.php @@ -43,7 +43,8 @@ class AssetAccountName extends BasicConverter implements ConverterInterface } /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class, [$this->user]); + $repository = app(AccountRepositoryInterface::class); + $repository->setUser($this->user); if (isset($this->mapping[$value])) { diff --git a/app/Import/Converter/AssetAccountNumber.php b/app/Import/Converter/AssetAccountNumber.php index 5c71bf57f1..d389492c91 100644 --- a/app/Import/Converter/AssetAccountNumber.php +++ b/app/Import/Converter/AssetAccountNumber.php @@ -41,7 +41,8 @@ class AssetAccountNumber extends BasicConverter implements ConverterInterface } /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class, [$this->user]); + $repository = app(AccountRepositoryInterface::class); + $repository->setUser($this->user); if (isset($this->mapping[$value])) { diff --git a/app/Import/Converter/BillId.php b/app/Import/Converter/BillId.php index 06713afaf4..cb20e4c7c9 100644 --- a/app/Import/Converter/BillId.php +++ b/app/Import/Converter/BillId.php @@ -42,7 +42,8 @@ class BillId extends BasicConverter implements ConverterInterface } /** @var BillRepositoryInterface $repository */ - $repository = app(BillRepositoryInterface::class, [$this->user]); + $repository = app(BillRepositoryInterface::class); + $repository->setUser($this->user); if (isset($this->mapping[$value])) { Log::debug('Found bill in mapping. Should exist.', ['value' => $value, 'map' => $this->mapping[$value]]); diff --git a/app/Import/Converter/BillName.php b/app/Import/Converter/BillName.php index 6c4aa2fc17..3d2dbe9a71 100644 --- a/app/Import/Converter/BillName.php +++ b/app/Import/Converter/BillName.php @@ -44,7 +44,8 @@ class BillName extends BasicConverter implements ConverterInterface } /** @var BillRepositoryInterface $repository */ - $repository = app(BillRepositoryInterface::class, [$this->user]); + $repository = app(BillRepositoryInterface::class); + $repository->setUser($this->user); if (isset($this->mapping[$value])) { Log::debug('Found bill in mapping. Should exist.', ['value' => $value, 'map' => $this->mapping[$value]]); diff --git a/app/Import/Converter/BudgetId.php b/app/Import/Converter/BudgetId.php index 0fe769f70e..cf709c0beb 100644 --- a/app/Import/Converter/BudgetId.php +++ b/app/Import/Converter/BudgetId.php @@ -42,7 +42,8 @@ class BudgetId extends BasicConverter implements ConverterInterface } /** @var BudgetRepositoryInterface $repository */ - $repository = app(BudgetRepositoryInterface::class, [$this->user]); + $repository = app(BudgetRepositoryInterface::class); + $repository->setUser($this->user); if (isset($this->mapping[$value])) { Log::debug('Found budget in mapping. Should exist.', ['value' => $value, 'map' => $this->mapping[$value]]); diff --git a/app/Import/Converter/BudgetName.php b/app/Import/Converter/BudgetName.php index fc5d5416fc..7ecd85530c 100644 --- a/app/Import/Converter/BudgetName.php +++ b/app/Import/Converter/BudgetName.php @@ -42,7 +42,8 @@ class BudgetName extends BasicConverter implements ConverterInterface } /** @var BudgetRepositoryInterface $repository */ - $repository = app(BudgetRepositoryInterface::class, [$this->user]); + $repository = app(BudgetRepositoryInterface::class); + $repository->setUser($this->user); if (isset($this->mapping[$value])) { Log::debug('Found budget in mapping. Should exist.', ['value' => $value, 'map' => $this->mapping[$value]]); diff --git a/app/Import/Converter/CategoryId.php b/app/Import/Converter/CategoryId.php index 5d538f4b90..2544a61597 100644 --- a/app/Import/Converter/CategoryId.php +++ b/app/Import/Converter/CategoryId.php @@ -42,7 +42,8 @@ class CategoryId extends BasicConverter implements ConverterInterface } /** @var CategoryRepositoryInterface $repository */ - $repository = app(CategoryRepositoryInterface::class, [$this->user]); + $repository = app(CategoryRepositoryInterface::class); + $repository->setUser($this->user); if (isset($this->mapping[$value])) { Log::debug('Found category in mapping. Should exist.', ['value' => $value, 'map' => $this->mapping[$value]]); diff --git a/app/Import/Converter/CategoryName.php b/app/Import/Converter/CategoryName.php index 28e7650c1f..f8af2414b1 100644 --- a/app/Import/Converter/CategoryName.php +++ b/app/Import/Converter/CategoryName.php @@ -42,7 +42,8 @@ class CategoryName extends BasicConverter implements ConverterInterface } /** @var CategoryRepositoryInterface $repository */ - $repository = app(CategoryRepositoryInterface::class, [$this->user]); + $repository = app(CategoryRepositoryInterface::class); + $repository->setUser($this->user); if (isset($this->mapping[$value])) { Log::debug('Found category in mapping. Should exist.', ['value' => $value, 'map' => $this->mapping[$value]]); diff --git a/app/Import/Converter/CurrencyCode.php b/app/Import/Converter/CurrencyCode.php index 48901cceaa..f78433ddf3 100644 --- a/app/Import/Converter/CurrencyCode.php +++ b/app/Import/Converter/CurrencyCode.php @@ -36,6 +36,7 @@ class CurrencyCode extends BasicConverter implements ConverterInterface /** @var CurrencyRepositoryInterface $repository */ $repository = app(CurrencyRepositoryInterface::class); + $repository->setUser($this->user); if (isset($this->mapping[$value])) { Log::debug('Found currency in mapping. Should exist.', ['value' => $value, 'map' => $this->mapping[$value]]); diff --git a/app/Import/Converter/CurrencyId.php b/app/Import/Converter/CurrencyId.php index 6622899264..299cde1bf3 100644 --- a/app/Import/Converter/CurrencyId.php +++ b/app/Import/Converter/CurrencyId.php @@ -42,7 +42,8 @@ class CurrencyId extends BasicConverter implements ConverterInterface } /** @var CurrencyRepositoryInterface $repository */ - $repository = app(CurrencyRepositoryInterface::class, [$this->user]); + $repository = app(CurrencyRepositoryInterface::class); + $repository->setUser($this->user); if (isset($this->mapping[$value])) { Log::debug('Found currency in mapping. Should exist.', ['value' => $value, 'map' => $this->mapping[$value]]); diff --git a/app/Import/Converter/CurrencyName.php b/app/Import/Converter/CurrencyName.php index ad28107f4b..71af377582 100644 --- a/app/Import/Converter/CurrencyName.php +++ b/app/Import/Converter/CurrencyName.php @@ -42,7 +42,8 @@ class CurrencyName extends BasicConverter implements ConverterInterface } /** @var CurrencyRepositoryInterface $repository */ - $repository = app(CurrencyRepositoryInterface::class, [$this->user]); + $repository = app(CurrencyRepositoryInterface::class); + $repository->setUser($this->user); if (isset($this->mapping[$value])) { Log::debug('Found currency in mapping. Should exist.', ['value' => $value, 'map' => $this->mapping[$value]]); diff --git a/app/Import/Converter/CurrencySymbol.php b/app/Import/Converter/CurrencySymbol.php index 307d409cd0..27ed50dd48 100644 --- a/app/Import/Converter/CurrencySymbol.php +++ b/app/Import/Converter/CurrencySymbol.php @@ -42,7 +42,8 @@ class CurrencySymbol extends BasicConverter implements ConverterInterface } /** @var CurrencyRepositoryInterface $repository */ - $repository = app(CurrencyRepositoryInterface::class, [$this->user]); + $repository = app(CurrencyRepositoryInterface::class); + $repository->setUser($this->user); if (isset($this->mapping[$value])) { Log::debug('Found currency in mapping. Should exist.', ['value' => $value, 'map' => $this->mapping[$value]]); diff --git a/app/Import/Converter/OpposingAccountIban.php b/app/Import/Converter/OpposingAccountIban.php index c3dacbd712..ee8b40747c 100644 --- a/app/Import/Converter/OpposingAccountIban.php +++ b/app/Import/Converter/OpposingAccountIban.php @@ -43,7 +43,8 @@ class OpposingAccountIban extends BasicConverter implements ConverterInterface } /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class, [$this->user]); + $repository = app(AccountRepositoryInterface::class); + $repository->setUser($this->user); if (isset($this->mapping[$value])) { diff --git a/app/Import/Converter/OpposingAccountName.php b/app/Import/Converter/OpposingAccountName.php index 4516873a25..fa51245fd6 100644 --- a/app/Import/Converter/OpposingAccountName.php +++ b/app/Import/Converter/OpposingAccountName.php @@ -42,7 +42,8 @@ class OpposingAccountName extends BasicConverter implements ConverterInterface } /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class, [$this->user]); + $repository = app(AccountRepositoryInterface::class); + $repository->setUser($this->user); if (isset($this->mapping[$value])) { diff --git a/app/Import/Converter/OpposingAccountNumber.php b/app/Import/Converter/OpposingAccountNumber.php index 86df680223..d513a88ae0 100644 --- a/app/Import/Converter/OpposingAccountNumber.php +++ b/app/Import/Converter/OpposingAccountNumber.php @@ -43,7 +43,8 @@ class OpposingAccountNumber extends BasicConverter implements ConverterInterface } /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class, [$this->user]); + $repository = app(AccountRepositoryInterface::class); + $repository->setUser($this->user); if (isset($this->mapping[$value])) { diff --git a/app/Import/Converter/TagSplit.php b/app/Import/Converter/TagSplit.php index cc99561663..d93074b7d0 100644 --- a/app/Import/Converter/TagSplit.php +++ b/app/Import/Converter/TagSplit.php @@ -39,7 +39,8 @@ class TagSplit Log::debug('Exploded parts.', $parts); /** @var TagRepositoryInterface $repository */ - $repository = app(TagRepositoryInterface::class, [$user]); + $repository = app(TagRepositoryInterface::class); + $repository->setUser($user); /** @var string $part */ diff --git a/app/Import/ImportProcedure.php b/app/Import/ImportProcedure.php index c535d47fae..991c5addcd 100644 --- a/app/Import/ImportProcedure.php +++ b/app/Import/ImportProcedure.php @@ -58,7 +58,8 @@ class ImportProcedure implements ImportProcedureInterface if ($job->configuration['import-account'] != 0) { /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class, [$job->user]); + $repository = app(AccountRepositoryInterface::class); + $repository->setUser($job->user); $validator->setDefaultImportAccount($repository->find($job->configuration['import-account'])); } diff --git a/app/Import/ImportStorage.php b/app/Import/ImportStorage.php index 4edf17d5f8..12b5e33a6c 100644 --- a/app/Import/ImportStorage.php +++ b/app/Import/ImportStorage.php @@ -159,7 +159,8 @@ class ImportStorage private function createImportTag(): Tag { /** @var TagRepositoryInterface $repository */ - $repository = app(TagRepositoryInterface::class, [$this->user]); + $repository = app(TagRepositoryInterface::class); + $repository->setUser($this->user); $data = [ 'tag' => trans('firefly.import_with_key', ['key' => $this->job->key]), 'date' => new Carbon, diff --git a/app/Import/ImportValidator.php b/app/Import/ImportValidator.php index d6d15d3ed2..9a5a254151 100644 --- a/app/Import/ImportValidator.php +++ b/app/Import/ImportValidator.php @@ -177,7 +177,8 @@ class ImportValidator // find it first by new type: /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class, [$this->user]); + $repository = app(AccountRepositoryInterface::class); + $repository->setUser($this->user); $result = $repository->findByName($account->name, [$type]); if (is_null($result->id)) { @@ -214,7 +215,8 @@ class ImportValidator { /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class, [$this->user]); + $repository = app(AccountRepositoryInterface::class); + $repository->setUser($this->user); $name = 'Unknown expense account'; $result = $repository->findByName($name, [AccountType::EXPENSE]); @@ -235,7 +237,8 @@ class ImportValidator { /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class, [$this->user]); + $repository = app(AccountRepositoryInterface::class); + $repository->setUser($this->user); $name = 'Unknown revenue account'; $result = $repository->findByName($name, [AccountType::REVENUE]); @@ -382,7 +385,8 @@ class ImportValidator { if (is_null($entry->fields['currency'])) { /** @var CurrencyRepositoryInterface $repository */ - $repository = app(CurrencyRepositoryInterface::class, [$this->user]); + $repository = app(CurrencyRepositoryInterface::class); + $repository->setUser($this->user); // is the default currency for the user or the system $defaultCode = Preferences::getForUser($this->user, 'currencyPreference', config('firefly.default_currency', 'EUR'))->data; diff --git a/app/Import/Setup/CsvSetup.php b/app/Import/Setup/CsvSetup.php index 20c938bda3..ff20d45958 100644 --- a/app/Import/Setup/CsvSetup.php +++ b/app/Import/Setup/CsvSetup.php @@ -181,7 +181,8 @@ class CsvSetup implements SetupInterface public function saveImportConfiguration(array $data, FileBag $files): bool { /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class, [auth()->user()]); + $repository = app(AccountRepositoryInterface::class); + $repository->setUser(auth()->user()); $importId = $data['csv_import_account'] ?? 0; $account = $repository->find(intval($importId)); diff --git a/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php b/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php index 1678cb2bcc..15a852414e 100644 --- a/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php +++ b/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php @@ -156,7 +156,8 @@ class ExecuteRuleGroupOnExistingTransactions extends Job implements ShouldQueue protected function collectJournals() { /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAccounts($this->accounts)->setRange($this->startDate, $this->endDate); return $collector->getJournals(); diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 8f0588dc1a..9b4f985390 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -442,7 +442,8 @@ class BudgetRepository implements BudgetRepositoryInterface public function spentInPeriod(Collection $budgets, Collection $accounts, Carbon $start, Carbon $end): string { /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [$this->user]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser($this->user); $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setBudgets($budgets); if ($accounts->count() > 0) { @@ -468,7 +469,8 @@ class BudgetRepository implements BudgetRepositoryInterface public function spentInPeriodWoBudget(Collection $accounts, Carbon $start, Carbon $end): string { /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [$this->user]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser($this->user); $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->withoutBudget(); if ($accounts->count() > 0) { diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index fb366c0812..bed2d5847f 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -57,7 +57,8 @@ class CategoryRepository implements CategoryRepositoryInterface public function earnedInPeriod(Collection $categories, Collection $accounts, Carbon $start, Carbon $end): string { /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [$this->user]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser($this->user); $collector->setRange($start, $end)->setTypes([TransactionType::DEPOSIT])->setAccounts($accounts)->setCategories($categories); $set = $collector->getJournals(); $sum = strval($set->sum('transaction_amount')); @@ -393,7 +394,8 @@ class CategoryRepository implements CategoryRepositoryInterface public function spentInPeriod(Collection $categories, Collection $accounts, Carbon $start, Carbon $end): string { /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [$this->user]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser($this->user); $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setCategories($categories); @@ -421,7 +423,8 @@ class CategoryRepository implements CategoryRepositoryInterface public function spentInPeriodWithoutCategory(Collection $accounts, Carbon $start, Carbon $end): string { /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [$this->user]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser($this->user); $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->withoutCategory(); if ($accounts->count() > 0) { diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 1b0950467f..9f91816252 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -394,7 +394,8 @@ class TagRepository implements TagRepositoryInterface public function earnedInPeriod(Tag $tag, Carbon $start, Carbon $end): string { /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [$this->user]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser($this->user); $collector->setRange($start, $end)->setTypes([TransactionType::DEPOSIT])->setAllAssetAccounts()->setTag($tag); $set = $collector->getJournals(); $sum = strval($set->sum('transaction_amount')); @@ -412,7 +413,8 @@ class TagRepository implements TagRepositoryInterface public function spentInPeriod(Tag $tag, Carbon $start, Carbon $end): string { /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [$this->user]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser($this->user); $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setAllAssetAccounts()->setTag($tag); $set = $collector->getJournals(); $sum = strval($set->sum('transaction_amount')); diff --git a/app/Rules/Actions/SetBudget.php b/app/Rules/Actions/SetBudget.php index 90d7aa6d18..e9f8c1fae9 100644 --- a/app/Rules/Actions/SetBudget.php +++ b/app/Rules/Actions/SetBudget.php @@ -50,7 +50,8 @@ class SetBudget implements ActionInterface public function act(TransactionJournal $journal): bool { /** @var BudgetRepositoryInterface $repository */ - $repository = app(BudgetRepositoryInterface::class, [$journal->user]); + $repository = app(BudgetRepositoryInterface::class); + $repository->setUser($journal->user); $search = $this->action->action_value; $budgets = $repository->getActiveBudgets(); $budget = $budgets->filter( diff --git a/app/Rules/Actions/SetDestinationAccount.php b/app/Rules/Actions/SetDestinationAccount.php index 829c4928c4..25677e546b 100644 --- a/app/Rules/Actions/SetDestinationAccount.php +++ b/app/Rules/Actions/SetDestinationAccount.php @@ -60,7 +60,8 @@ class SetDestinationAccount implements ActionInterface public function act(TransactionJournal $journal): bool { $this->journal = $journal; - $this->repository = app(AccountRepositoryInterface::class, [$journal->user]); + $this->repository = app(AccountRepositoryInterface::class); + $this->repository->setUser($journal->user); $count = $journal->transactions()->count(); if ($count > 2) { Log::error(sprintf('Cannot change destination account of journal #%d because it is a split journal.', $journal->id)); diff --git a/app/Rules/Actions/SetSourceAccount.php b/app/Rules/Actions/SetSourceAccount.php index 5e625fe886..fc8067856c 100644 --- a/app/Rules/Actions/SetSourceAccount.php +++ b/app/Rules/Actions/SetSourceAccount.php @@ -60,7 +60,8 @@ class SetSourceAccount implements ActionInterface public function act(TransactionJournal $journal): bool { $this->journal = $journal; - $this->repository = app(AccountRepositoryInterface::class, [$journal->user]); + $this->repository = app(AccountRepositoryInterface::class); + $this->repository->setUser($journal->user); $count = $journal->transactions()->count(); if ($count > 2) { Log::error(sprintf('Cannot change source account of journal #%d because it is a split journal.', $journal->id)); diff --git a/app/Rules/TransactionMatcher.php b/app/Rules/TransactionMatcher.php index acac7c8521..5241e4f84c 100644 --- a/app/Rules/TransactionMatcher.php +++ b/app/Rules/TransactionMatcher.php @@ -78,7 +78,8 @@ class TransactionMatcher do { // Fetch a batch of transactions from the database /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [auth()->user()]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser(auth()->user()); $collector->setAllAssetAccounts()->setLimit($pageSize)->setPage($page)->setTypes($this->transactionTypes); $set = $collector->getPaginatedJournals(); Log::debug(sprintf('Found %d journals to check. ', $set->count())); diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php index c71e1e2985..b37af85daa 100644 --- a/app/Support/Search/Search.php +++ b/app/Support/Search/Search.php @@ -37,16 +37,6 @@ class Search implements SearchInterface /** @var User */ private $user; - /** - * AttachmentRepository constructor. - * - * @param User $user - */ - public function __construct(User $user) - { - $this->user = $user; - } - /** * The search will assume that the user does not have so many accounts * that this search should be paginated. @@ -164,7 +154,8 @@ class Search implements SearchInterface $result = new Collection(); do { /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class, [$this->user]); + $collector = app(JournalCollectorInterface::class); + $collector->setUser($this->user); $collector->setAllAssetAccounts()->setLimit($pageSize)->setPage($page); $set = $collector->getPaginatedJournals(); Log::debug(sprintf('Found %d journals to check. ', $set->count())); @@ -222,6 +213,14 @@ class Search implements SearchInterface $this->limit = $limit; } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * @param string $haystack * @param array $needle @@ -241,4 +240,4 @@ class Search implements SearchInterface return false; } -} +} diff --git a/app/Support/Search/SearchInterface.php b/app/Support/Search/SearchInterface.php index bd16c78853..ed9c3c6c88 100644 --- a/app/Support/Search/SearchInterface.php +++ b/app/Support/Search/SearchInterface.php @@ -13,6 +13,7 @@ declare(strict_types = 1); namespace FireflyIII\Support\Search; +use FireflyIII\User; use Illuminate\Support\Collection; /** @@ -29,6 +30,11 @@ interface SearchInterface */ public function searchAccounts(array $words): Collection; + /** + * @param User $user + */ + public function setUser(User $user); + /** * @param array $words * From 3a7faa736836aa626ab4aa21cfaa57fe3db8fc85 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 5 Feb 2017 18:44:37 +0100 Subject: [PATCH 042/276] Small fixes for laravel 5.4 --- app/Http/Controllers/Controller.php | 3 --- app/Http/Controllers/Transaction/SingleController.php | 1 - config/app.php | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index d2233d75fb..bbf6cb51d5 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -83,12 +83,9 @@ class Controller extends BaseController protected function getPreviousUri(string $identifier): string { $uri = strval(session($identifier)); - // 1 (see above): if (!(strpos($identifier, 'delete') === false) && !(strpos($uri, '/show/') === false)) { $uri = route('index'); } - - // 2 (see above) if (!(strpos($uri, 'javascript') === false)) { $uri = route('index'); } diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index c031443e1c..4a70121724 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -190,7 +190,6 @@ class SingleController extends Controller if ($this->isOpeningBalance($transactionJournal)) { return $this->redirectToAccount($transactionJournal); } - $journalId = $transactionJournal->id; $type = TransactionJournal::transactionTypeStr($transactionJournal); Session::flash('success', strval(trans('firefly.deleted_' . strtolower($type), ['description' => e($transactionJournal->description)]))); diff --git a/config/app.php b/config/app.php index 1bbf9d2452..a990e181f9 100755 --- a/config/app.php +++ b/config/app.php @@ -50,6 +50,8 @@ return [ Illuminate\Translation\TranslationServiceProvider::class, Illuminate\Validation\ValidationServiceProvider::class, Illuminate\View\ViewServiceProvider::class, + Collective\Html\HtmlServiceProvider::class, + /* * Application Service Providers... From c6f69f63fc5c278b38e51d4b67f4ca34779cf46a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 5 Feb 2017 18:49:13 +0100 Subject: [PATCH 043/276] Friendly error message. [skip ci] --- resources/views/errors/FireflyException.twig | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/resources/views/errors/FireflyException.twig b/resources/views/errors/FireflyException.twig index 9d8343e04c..0e3499c8f3 100644 --- a/resources/views/errors/FireflyException.twig +++ b/resources/views/errors/FireflyException.twig @@ -38,6 +38,20 @@

                                                                                                                                                                                              + {% if not debug %} +
                                                                                                                                                                                              +
                                                                                                                                                                                              +

                                                                                                                                                                                              + More information about this error may be available in the log files. Search for the error above and a stack trace + will appear. This stack trace may help you track down what's going wrong. +

                                                                                                                                                                                              +

                                                                                                                                                                                              + If you cannot find the cause of this error or when you need some help, please open a ticket on + Github. +

                                                                                                                                                                                              +
                                                                                                                                                                                              +
                                                                                                                                                                                              + {% endif %} {% if debug %} @@ -51,5 +65,6 @@ {% endif %} + From b09a250a031422689e82b3ca7ace46c7ab816c80 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 5 Feb 2017 18:50:19 +0100 Subject: [PATCH 044/276] Better link for issues. [skip ci] --- resources/views/emails/error-html.twig | 2 +- resources/views/emails/error-text.twig | 2 +- resources/views/errors/FireflyException.twig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/emails/error-html.twig b/resources/views/emails/error-html.twig index afc890506a..5594a2a7eb 100644 --- a/resources/views/emails/error-html.twig +++ b/resources/views/emails/error-html.twig @@ -34,7 +34,7 @@ This can help fix the bug you just encountered.

                                                                                                                                                                                              - If you prefer, you can also open a new issue on Github. + If you prefer, you can also open a new issue on Github.

                                                                                                                                                                                              diff --git a/resources/views/emails/error-text.twig b/resources/views/emails/error-text.twig index 913d54d741..e195cdb631 100644 --- a/resources/views/emails/error-text.twig +++ b/resources/views/emails/error-text.twig @@ -21,7 +21,7 @@ the bug you just encountered. If you prefer, you can also open a new issue here: -https://github.com/firefly-iii/firefly-iii/issues/new +https://github.com/firefly-iii/firefly-iii/issues The full stacktrace is below: diff --git a/resources/views/errors/FireflyException.twig b/resources/views/errors/FireflyException.twig index 0e3499c8f3..01028a7e9d 100644 --- a/resources/views/errors/FireflyException.twig +++ b/resources/views/errors/FireflyException.twig @@ -47,7 +47,7 @@

                                                                                                                                                                                              If you cannot find the cause of this error or when you need some help, please open a ticket on - Github. + Github.

                                                                                                                                                                                              From dba92d73c43ec070d3e896751347d44a50f8dbb4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 5 Feb 2017 19:51:58 +0100 Subject: [PATCH 045/276] Include new line at the end of the file. --- app/Helpers/Chart/MetaPieChart.php | 2 +- app/Helpers/Chart/MetaPieChartInterface.php | 2 +- app/Http/Controllers/JavascriptController.php | 2 +- app/Import/ImportProcedureInterface.php | 2 +- app/Providers/LogServiceProvider.php | 2 +- config/app.php | 0 resources/lang/de_DE/auth.php | 2 +- resources/lang/de_DE/breadcrumbs.php | 2 +- resources/lang/de_DE/config.php | 2 +- resources/lang/de_DE/csv.php | 2 +- resources/lang/de_DE/demo.php | 2 +- resources/lang/de_DE/firefly.php | 2 +- resources/lang/de_DE/form.php | 2 +- resources/lang/de_DE/help.php | 2 +- resources/lang/de_DE/list.php | 2 +- resources/lang/de_DE/pagination.php | 2 +- resources/lang/de_DE/passwords.php | 2 +- resources/lang/de_DE/validation.php | 2 +- resources/lang/en_US/auth.php | 0 resources/lang/en_US/demo.php | 2 +- resources/lang/en_US/pagination.php | 0 resources/lang/en_US/passwords.php | 0 resources/lang/es_ES/auth.php | 2 +- resources/lang/es_ES/breadcrumbs.php | 2 +- resources/lang/es_ES/config.php | 2 +- resources/lang/es_ES/csv.php | 2 +- resources/lang/es_ES/demo.php | 2 +- resources/lang/es_ES/firefly.php | 2 +- resources/lang/es_ES/form.php | 2 +- resources/lang/es_ES/help.php | 2 +- resources/lang/es_ES/list.php | 2 +- resources/lang/es_ES/pagination.php | 2 +- resources/lang/es_ES/passwords.php | 2 +- resources/lang/es_ES/validation.php | 2 +- resources/lang/fr_FR/auth.php | 2 +- resources/lang/fr_FR/breadcrumbs.php | 2 +- resources/lang/fr_FR/config.php | 2 +- resources/lang/fr_FR/csv.php | 2 +- resources/lang/fr_FR/demo.php | 2 +- resources/lang/fr_FR/firefly.php | 2 +- resources/lang/fr_FR/form.php | 2 +- resources/lang/fr_FR/help.php | 2 +- resources/lang/fr_FR/list.php | 2 +- resources/lang/fr_FR/pagination.php | 2 +- resources/lang/fr_FR/passwords.php | 2 +- resources/lang/fr_FR/validation.php | 2 +- resources/lang/hr_HR/auth.php | 2 +- resources/lang/hr_HR/breadcrumbs.php | 2 +- resources/lang/hr_HR/config.php | 2 +- resources/lang/hr_HR/csv.php | 2 +- resources/lang/hr_HR/demo.php | 2 +- resources/lang/hr_HR/firefly.php | 2 +- resources/lang/hr_HR/form.php | 2 +- resources/lang/hr_HR/help.php | 2 +- resources/lang/hr_HR/list.php | 2 +- resources/lang/hr_HR/pagination.php | 2 +- resources/lang/hr_HR/passwords.php | 2 +- resources/lang/hr_HR/validation.php | 2 +- resources/lang/nl_NL/auth.php | 2 +- resources/lang/nl_NL/breadcrumbs.php | 2 +- resources/lang/nl_NL/config.php | 2 +- resources/lang/nl_NL/csv.php | 2 +- resources/lang/nl_NL/demo.php | 2 +- resources/lang/nl_NL/firefly.php | 2 +- resources/lang/nl_NL/form.php | 2 +- resources/lang/nl_NL/help.php | 2 +- resources/lang/nl_NL/list.php | 2 +- resources/lang/nl_NL/pagination.php | 2 +- resources/lang/nl_NL/passwords.php | 2 +- resources/lang/nl_NL/validation.php | 2 +- resources/lang/pl_PL/auth.php | 2 +- resources/lang/pl_PL/breadcrumbs.php | 2 +- resources/lang/pl_PL/config.php | 2 +- resources/lang/pl_PL/csv.php | 2 +- resources/lang/pl_PL/demo.php | 2 +- resources/lang/pl_PL/firefly.php | 2 +- resources/lang/pl_PL/form.php | 2 +- resources/lang/pl_PL/help.php | 2 +- resources/lang/pl_PL/list.php | 2 +- resources/lang/pl_PL/pagination.php | 2 +- resources/lang/pl_PL/passwords.php | 2 +- resources/lang/pl_PL/validation.php | 2 +- resources/lang/pt_BR/auth.php | 2 +- resources/lang/pt_BR/breadcrumbs.php | 2 +- resources/lang/pt_BR/config.php | 2 +- resources/lang/pt_BR/csv.php | 2 +- resources/lang/pt_BR/demo.php | 2 +- resources/lang/pt_BR/firefly.php | 2 +- resources/lang/pt_BR/form.php | 2 +- resources/lang/pt_BR/help.php | 2 +- resources/lang/pt_BR/list.php | 2 +- resources/lang/pt_BR/pagination.php | 2 +- resources/lang/pt_BR/passwords.php | 2 +- resources/lang/pt_BR/validation.php | 2 +- resources/lang/ru_RU/auth.php | 2 +- resources/lang/ru_RU/breadcrumbs.php | 2 +- resources/lang/ru_RU/config.php | 2 +- resources/lang/ru_RU/csv.php | 2 +- resources/lang/ru_RU/demo.php | 2 +- resources/lang/ru_RU/firefly.php | 2 +- resources/lang/ru_RU/form.php | 2 +- resources/lang/ru_RU/help.php | 2 +- resources/lang/ru_RU/list.php | 2 +- resources/lang/ru_RU/pagination.php | 2 +- resources/lang/ru_RU/passwords.php | 2 +- resources/lang/ru_RU/validation.php | 2 +- resources/lang/zh_HK/auth.php | 2 +- resources/lang/zh_HK/breadcrumbs.php | 2 +- resources/lang/zh_HK/config.php | 2 +- resources/lang/zh_HK/csv.php | 2 +- resources/lang/zh_HK/demo.php | 2 +- resources/lang/zh_HK/firefly.php | 2 +- resources/lang/zh_HK/form.php | 2 +- resources/lang/zh_HK/help.php | 2 +- resources/lang/zh_HK/list.php | 2 +- resources/lang/zh_HK/pagination.php | 2 +- resources/lang/zh_HK/passwords.php | 2 +- resources/lang/zh_HK/validation.php | 2 +- resources/lang/zh_TW/auth.php | 2 +- resources/lang/zh_TW/breadcrumbs.php | 2 +- resources/lang/zh_TW/config.php | 2 +- resources/lang/zh_TW/csv.php | 2 +- resources/lang/zh_TW/demo.php | 2 +- resources/lang/zh_TW/firefly.php | 2 +- resources/lang/zh_TW/form.php | 2 +- resources/lang/zh_TW/help.php | 2 +- resources/lang/zh_TW/list.php | 2 +- resources/lang/zh_TW/pagination.php | 2 +- resources/lang/zh_TW/passwords.php | 2 +- resources/lang/zh_TW/validation.php | 2 +- resources/views/accounts/create.twig | 2 +- resources/views/accounts/edit.twig | 2 +- resources/views/demo/accounts/index.twig | 2 +- resources/views/demo/budgets/index.twig | 2 +- resources/views/demo/currencies/index.twig | 2 +- resources/views/demo/home.twig | 2 +- resources/views/demo/import/configure.twig | 2 +- resources/views/demo/import/index.twig | 2 +- resources/views/demo/index.twig | 2 +- resources/views/demo/piggy-banks/index.twig | 2 +- resources/views/demo/reports/index.twig | 2 +- resources/views/demo/transactions/index.twig | 2 +- resources/views/export/index.twig | 2 +- resources/views/javascript/variables.twig | 2 +- resources/views/piggy-banks/create.twig | 2 +- resources/views/piggy-banks/edit.twig | 2 +- resources/views/preferences/index.twig | 2 +- resources/views/reports/options/category.twig | 2 +- resources/views/rules/rule-group/select-transactions.twig | 2 +- resources/views/tags/create.twig | 2 +- resources/views/tags/edit.twig | 2 +- tests/CreatesApplication.php | 2 +- tests/Feature/ExampleTest.php | 2 +- tests/TestCase.php | 2 +- tests/Unit/ExampleTest.php | 2 +- 155 files changed, 151 insertions(+), 151 deletions(-) mode change 100755 => 100644 config/app.php mode change 100755 => 100644 resources/lang/en_US/auth.php mode change 100755 => 100644 resources/lang/en_US/pagination.php mode change 100755 => 100644 resources/lang/en_US/passwords.php diff --git a/app/Helpers/Chart/MetaPieChart.php b/app/Helpers/Chart/MetaPieChart.php index e83b103ba0..4290720405 100644 --- a/app/Helpers/Chart/MetaPieChart.php +++ b/app/Helpers/Chart/MetaPieChart.php @@ -279,4 +279,4 @@ class MetaPieChart implements MetaPieChartInterface return $chartData; } -} \ No newline at end of file +} diff --git a/app/Helpers/Chart/MetaPieChartInterface.php b/app/Helpers/Chart/MetaPieChartInterface.php index a466db8a38..006300d308 100644 --- a/app/Helpers/Chart/MetaPieChartInterface.php +++ b/app/Helpers/Chart/MetaPieChartInterface.php @@ -79,4 +79,4 @@ interface MetaPieChartInterface */ public function setUser(User $user): MetaPieChartInterface; -} \ No newline at end of file +} diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index 67c3d268d7..719371598e 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/app/Http/Controllers/JavascriptController.php @@ -129,4 +129,4 @@ class JavascriptController extends Controller ]; } -} \ No newline at end of file +} diff --git a/app/Import/ImportProcedureInterface.php b/app/Import/ImportProcedureInterface.php index 72765aa4ce..22a519aa95 100644 --- a/app/Import/ImportProcedureInterface.php +++ b/app/Import/ImportProcedureInterface.php @@ -30,4 +30,4 @@ interface ImportProcedureInterface */ public function runImport(ImportJob $job): Collection; -} \ No newline at end of file +} diff --git a/app/Providers/LogServiceProvider.php b/app/Providers/LogServiceProvider.php index 86bf30481f..dc742d6b80 100644 --- a/app/Providers/LogServiceProvider.php +++ b/app/Providers/LogServiceProvider.php @@ -50,4 +50,4 @@ class LogServiceProvider extends LaravelLogServiceProvider $this->logLevel() ); } -} \ No newline at end of file +} diff --git a/config/app.php b/config/app.php old mode 100755 new mode 100644 diff --git a/resources/lang/de_DE/auth.php b/resources/lang/de_DE/auth.php index 5eff4c4e6b..a20bd688a1 100644 --- a/resources/lang/de_DE/auth.php +++ b/resources/lang/de_DE/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => 'Falscher Benutzername und/oder falsches Passwort.', 'throttle' => 'Zu viele Login-Versuche. Bitte versuchen Sie es in :seconds Sekunde(n) erneut.', -]; \ No newline at end of file +]; diff --git a/resources/lang/de_DE/breadcrumbs.php b/resources/lang/de_DE/breadcrumbs.php index 0ce3f40bef..6566bd879c 100644 --- a/resources/lang/de_DE/breadcrumbs.php +++ b/resources/lang/de_DE/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => 'Neuen Tag erstellen', 'edit_tag' => 'Bearbeite Tag ":tag"', 'delete_tag' => 'Lösche Tag ":tag"', -]; \ No newline at end of file +]; diff --git a/resources/lang/de_DE/config.php b/resources/lang/de_DE/config.php index 783fe0a459..563a4b39ee 100644 --- a/resources/lang/de_DE/config.php +++ b/resources/lang/de_DE/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; \ No newline at end of file +]; diff --git a/resources/lang/de_DE/csv.php b/resources/lang/de_DE/csv.php index fca9ee7d0f..451551ca93 100644 --- a/resources/lang/de_DE/csv.php +++ b/resources/lang/de_DE/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (durch Leerzeichen getrennt)', 'column_account-number' => 'Bestandskonto (Kontonr.)', 'column_opposing-number' => 'Zielkonto (Kontonr.)', -]; \ No newline at end of file +]; diff --git a/resources/lang/de_DE/demo.php b/resources/lang/de_DE/demo.php index 24e22bfa97..3a54a5a14e 100644 --- a/resources/lang/de_DE/demo.php +++ b/resources/lang/de_DE/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Natürlich kann eine CSV-Datei in Firefly III importiert werden ', 'import-configure-security' => 'Aufgrund von Sicherheitsbedenken wurde der Upload mit einer lokalen Datei ersetzt.', 'import-configure-configuration' => 'Die unten stehende Konfiguration für die lokale Datei ist korrekt.', -]; \ No newline at end of file +]; diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index e0198d089f..2f72327fed 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -960,4 +960,4 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', -]; \ No newline at end of file +]; diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php index a5e6307e0d..ed179e8bcb 100644 --- a/resources/lang/de_DE/form.php +++ b/resources/lang/de_DE/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Zahlungsdatum', 'invoice_date' => 'Rechnungsdatum', 'internal_reference' => 'Interner Verweis', -]; \ No newline at end of file +]; diff --git a/resources/lang/de_DE/help.php b/resources/lang/de_DE/help.php index 54f198a3cd..6fe068f80e 100644 --- a/resources/lang/de_DE/help.php +++ b/resources/lang/de_DE/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => 'Denken Sie daran, dass jede Seite ein kleines Fragezeichen in der oberen rechten Ecke hat. Klicken Sie darauf um Hilfe zur aktuellen Seite zu erhalten.', 'index' => 'index', 'home' => 'home', -]; \ No newline at end of file +]; diff --git a/resources/lang/de_DE/list.php b/resources/lang/de_DE/list.php index 801ae0be8b..0b6e04f918 100644 --- a/resources/lang/de_DE/list.php +++ b/resources/lang/de_DE/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Anzahl Budgets', 'rule_and_groups_count' => 'Anzahl Regeln und Regelgruppen', 'tags_count' => 'Anzahl Tags', -]; \ No newline at end of file +]; diff --git a/resources/lang/de_DE/pagination.php b/resources/lang/de_DE/pagination.php index 37de9e090a..2d2efd2bd0 100644 --- a/resources/lang/de_DE/pagination.php +++ b/resources/lang/de_DE/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« Vorherige', 'next' => 'Nächste »', -]; \ No newline at end of file +]; diff --git a/resources/lang/de_DE/passwords.php b/resources/lang/de_DE/passwords.php index dcc36d2e91..b9deea7fd9 100644 --- a/resources/lang/de_DE/passwords.php +++ b/resources/lang/de_DE/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => 'Wir haben Ihnen einen Link zum Zurücksetzen des Passworts zugesendet!', 'reset' => 'Ihr Passwort wurde zurückgesetzt!', 'blocked' => 'Netter Versuch.', -]; \ No newline at end of file +]; diff --git a/resources/lang/de_DE/validation.php b/resources/lang/de_DE/validation.php index 56ca0aa328..472dc30487 100644 --- a/resources/lang/de_DE/validation.php +++ b/resources/lang/de_DE/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => ':attribute existiert nicht in :other.', 'present' => 'Das :attribute Feld muss vorhanden sein.', 'amount_zero' => 'Der Gesamtbetrag darf nicht Null sein', -]; \ No newline at end of file +]; diff --git a/resources/lang/en_US/auth.php b/resources/lang/en_US/auth.php old mode 100755 new mode 100644 diff --git a/resources/lang/en_US/demo.php b/resources/lang/en_US/demo.php index e7f8ea934d..3efa9c60a3 100644 --- a/resources/lang/en_US/demo.php +++ b/resources/lang/en_US/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Of course, any CSV file can be imported into Firefly III ', 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.', 'import-configure-configuration' => 'The configuration you see below is correct for the local file.', -]; \ No newline at end of file +]; diff --git a/resources/lang/en_US/pagination.php b/resources/lang/en_US/pagination.php old mode 100755 new mode 100644 diff --git a/resources/lang/en_US/passwords.php b/resources/lang/en_US/passwords.php old mode 100755 new mode 100644 diff --git a/resources/lang/es_ES/auth.php b/resources/lang/es_ES/auth.php index 5d833b3d68..7319a9d7b8 100644 --- a/resources/lang/es_ES/auth.php +++ b/resources/lang/es_ES/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => 'These credentials do not match our records.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', -]; \ No newline at end of file +]; diff --git a/resources/lang/es_ES/breadcrumbs.php b/resources/lang/es_ES/breadcrumbs.php index 6bcf9b862d..54cb260179 100644 --- a/resources/lang/es_ES/breadcrumbs.php +++ b/resources/lang/es_ES/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => 'Create new tag', 'edit_tag' => 'Edit tag ":tag"', 'delete_tag' => 'Delete tag ":tag"', -]; \ No newline at end of file +]; diff --git a/resources/lang/es_ES/config.php b/resources/lang/es_ES/config.php index 58220429bf..0c23d3f6cd 100644 --- a/resources/lang/es_ES/config.php +++ b/resources/lang/es_ES/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; \ No newline at end of file +]; diff --git a/resources/lang/es_ES/csv.php b/resources/lang/es_ES/csv.php index 4acb52efdc..6b5abd3431 100644 --- a/resources/lang/es_ES/csv.php +++ b/resources/lang/es_ES/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (space separated)', 'column_account-number' => 'Asset account (account number)', 'column_opposing-number' => 'Opposing account (account number)', -]; \ No newline at end of file +]; diff --git a/resources/lang/es_ES/demo.php b/resources/lang/es_ES/demo.php index e7f8ea934d..3efa9c60a3 100644 --- a/resources/lang/es_ES/demo.php +++ b/resources/lang/es_ES/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Of course, any CSV file can be imported into Firefly III ', 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.', 'import-configure-configuration' => 'The configuration you see below is correct for the local file.', -]; \ No newline at end of file +]; diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index a91170cd53..d54d34d4a6 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -959,4 +959,4 @@ return [ 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', -]; \ No newline at end of file +]; diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php index ff44cbf9ef..271005bc4f 100644 --- a/resources/lang/es_ES/form.php +++ b/resources/lang/es_ES/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Payment date', 'invoice_date' => 'Invoice date', 'internal_reference' => 'Internal reference', -]; \ No newline at end of file +]; diff --git a/resources/lang/es_ES/help.php b/resources/lang/es_ES/help.php index 61210ffe41..5198e5510f 100644 --- a/resources/lang/es_ES/help.php +++ b/resources/lang/es_ES/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.', 'index' => 'index', 'home' => 'home', -]; \ No newline at end of file +]; diff --git a/resources/lang/es_ES/list.php b/resources/lang/es_ES/list.php index 90625d54e6..91254e401d 100644 --- a/resources/lang/es_ES/list.php +++ b/resources/lang/es_ES/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Number of budgets', 'rule_and_groups_count' => 'Number of rules and rule groups', 'tags_count' => 'Number of tags', -]; \ No newline at end of file +]; diff --git a/resources/lang/es_ES/pagination.php b/resources/lang/es_ES/pagination.php index 4eeab21dee..9e61a6cfcc 100644 --- a/resources/lang/es_ES/pagination.php +++ b/resources/lang/es_ES/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« Previous', 'next' => 'Next »', -]; \ No newline at end of file +]; diff --git a/resources/lang/es_ES/passwords.php b/resources/lang/es_ES/passwords.php index 2e11aa92dc..8e1b72506b 100644 --- a/resources/lang/es_ES/passwords.php +++ b/resources/lang/es_ES/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => 'We have e-mailed your password reset link!', 'reset' => 'Your password has been reset!', 'blocked' => 'Nice try though.', -]; \ No newline at end of file +]; diff --git a/resources/lang/es_ES/validation.php b/resources/lang/es_ES/validation.php index addd0e6f39..ea21edefe4 100644 --- a/resources/lang/es_ES/validation.php +++ b/resources/lang/es_ES/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => 'The :attribute field does not exist in :other.', 'present' => 'The :attribute field must be present.', 'amount_zero' => 'The total amount cannot be zero', -]; \ No newline at end of file +]; diff --git a/resources/lang/fr_FR/auth.php b/resources/lang/fr_FR/auth.php index 7fc7beebaa..4b87a3d12c 100644 --- a/resources/lang/fr_FR/auth.php +++ b/resources/lang/fr_FR/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => 'Ces identifiants n\'ont aucune correspondance.', 'throttle' => 'Trop de tentatives de connexion. Veuillez essayer à nouveau dans :seconds secondes.', -]; \ No newline at end of file +]; diff --git a/resources/lang/fr_FR/breadcrumbs.php b/resources/lang/fr_FR/breadcrumbs.php index 5211db8cfe..2f4b250674 100644 --- a/resources/lang/fr_FR/breadcrumbs.php +++ b/resources/lang/fr_FR/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => 'Créer un nouveau tag', 'edit_tag' => 'Éditer le tag ":tag"', 'delete_tag' => 'Supprimer le tag ":tag"', -]; \ No newline at end of file +]; diff --git a/resources/lang/fr_FR/config.php b/resources/lang/fr_FR/config.php index 9ddc4761b8..a04e54e24b 100644 --- a/resources/lang/fr_FR/config.php +++ b/resources/lang/fr_FR/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; \ No newline at end of file +]; diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php index 2da66f7da6..1bb3e6666d 100644 --- a/resources/lang/fr_FR/csv.php +++ b/resources/lang/fr_FR/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags(séparé par des espaces)', 'column_account-number' => 'Compte d’actif (numéro de compte)', 'column_opposing-number' => 'Compte destination (numéro de compte)', -]; \ No newline at end of file +]; diff --git a/resources/lang/fr_FR/demo.php b/resources/lang/fr_FR/demo.php index e7f8ea934d..3efa9c60a3 100644 --- a/resources/lang/fr_FR/demo.php +++ b/resources/lang/fr_FR/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Of course, any CSV file can be imported into Firefly III ', 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.', 'import-configure-configuration' => 'The configuration you see below is correct for the local file.', -]; \ No newline at end of file +]; diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index cfd9123263..e7c6a9689f 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -959,4 +959,4 @@ return [ 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', -]; \ No newline at end of file +]; diff --git a/resources/lang/fr_FR/form.php b/resources/lang/fr_FR/form.php index e833b5995a..9e14815256 100644 --- a/resources/lang/fr_FR/form.php +++ b/resources/lang/fr_FR/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Date de paiement', 'invoice_date' => 'Date de facturation', 'internal_reference' => 'Référence interne', -]; \ No newline at end of file +]; diff --git a/resources/lang/fr_FR/help.php b/resources/lang/fr_FR/help.php index 42bdf91724..466fe59547 100644 --- a/resources/lang/fr_FR/help.php +++ b/resources/lang/fr_FR/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => 'N\'oubliez pas que chaque page a un petit point d\'interrogation en haut à droite. Cliquez dessus pour obtenir de l\'aide concernant la page actuelle.', 'index' => 'index', 'home' => 'accueil', -]; \ No newline at end of file +]; diff --git a/resources/lang/fr_FR/list.php b/resources/lang/fr_FR/list.php index 55aba8cc1d..663fecee44 100644 --- a/resources/lang/fr_FR/list.php +++ b/resources/lang/fr_FR/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Number of budgets', 'rule_and_groups_count' => 'Number of rules and rule groups', 'tags_count' => 'Number of tags', -]; \ No newline at end of file +]; diff --git a/resources/lang/fr_FR/pagination.php b/resources/lang/fr_FR/pagination.php index f073608f48..8adc2767a1 100644 --- a/resources/lang/fr_FR/pagination.php +++ b/resources/lang/fr_FR/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« Précédent', 'next' => 'Suivant »', -]; \ No newline at end of file +]; diff --git a/resources/lang/fr_FR/passwords.php b/resources/lang/fr_FR/passwords.php index 56d5c341d7..b9b998ec31 100644 --- a/resources/lang/fr_FR/passwords.php +++ b/resources/lang/fr_FR/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => 'Nous vous avons envoyé par e-mail un lien de réinitialisation de votre mot de passe !', 'reset' => 'Votre mot de passe a été réinitialisé !', 'blocked' => 'Bien essayé cependant.', -]; \ No newline at end of file +]; diff --git a/resources/lang/fr_FR/validation.php b/resources/lang/fr_FR/validation.php index aab122ceaa..f34faf28ea 100644 --- a/resources/lang/fr_FR/validation.php +++ b/resources/lang/fr_FR/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => 'The :attribute field does not exist in :other.', 'present' => 'The :attribute field must be present.', 'amount_zero' => 'The total amount cannot be zero', -]; \ No newline at end of file +]; diff --git a/resources/lang/hr_HR/auth.php b/resources/lang/hr_HR/auth.php index 5d833b3d68..7319a9d7b8 100644 --- a/resources/lang/hr_HR/auth.php +++ b/resources/lang/hr_HR/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => 'These credentials do not match our records.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', -]; \ No newline at end of file +]; diff --git a/resources/lang/hr_HR/breadcrumbs.php b/resources/lang/hr_HR/breadcrumbs.php index 4b23411578..b6c21030e4 100644 --- a/resources/lang/hr_HR/breadcrumbs.php +++ b/resources/lang/hr_HR/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => 'Kreiraj novu oznaku', 'edit_tag' => 'Uredi oznaku ":tag"', 'delete_tag' => 'Obriši oznaku ":tag"', -]; \ No newline at end of file +]; diff --git a/resources/lang/hr_HR/config.php b/resources/lang/hr_HR/config.php index aed39872de..1c612ab51c 100644 --- a/resources/lang/hr_HR/config.php +++ b/resources/lang/hr_HR/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; \ No newline at end of file +]; diff --git a/resources/lang/hr_HR/csv.php b/resources/lang/hr_HR/csv.php index 4acb52efdc..6b5abd3431 100644 --- a/resources/lang/hr_HR/csv.php +++ b/resources/lang/hr_HR/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (space separated)', 'column_account-number' => 'Asset account (account number)', 'column_opposing-number' => 'Opposing account (account number)', -]; \ No newline at end of file +]; diff --git a/resources/lang/hr_HR/demo.php b/resources/lang/hr_HR/demo.php index e7f8ea934d..3efa9c60a3 100644 --- a/resources/lang/hr_HR/demo.php +++ b/resources/lang/hr_HR/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Of course, any CSV file can be imported into Firefly III ', 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.', 'import-configure-configuration' => 'The configuration you see below is correct for the local file.', -]; \ No newline at end of file +]; diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php index a91170cd53..d54d34d4a6 100644 --- a/resources/lang/hr_HR/firefly.php +++ b/resources/lang/hr_HR/firefly.php @@ -959,4 +959,4 @@ return [ 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', -]; \ No newline at end of file +]; diff --git a/resources/lang/hr_HR/form.php b/resources/lang/hr_HR/form.php index ff44cbf9ef..271005bc4f 100644 --- a/resources/lang/hr_HR/form.php +++ b/resources/lang/hr_HR/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Payment date', 'invoice_date' => 'Invoice date', 'internal_reference' => 'Internal reference', -]; \ No newline at end of file +]; diff --git a/resources/lang/hr_HR/help.php b/resources/lang/hr_HR/help.php index 61210ffe41..5198e5510f 100644 --- a/resources/lang/hr_HR/help.php +++ b/resources/lang/hr_HR/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.', 'index' => 'index', 'home' => 'home', -]; \ No newline at end of file +]; diff --git a/resources/lang/hr_HR/list.php b/resources/lang/hr_HR/list.php index 90625d54e6..91254e401d 100644 --- a/resources/lang/hr_HR/list.php +++ b/resources/lang/hr_HR/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Number of budgets', 'rule_and_groups_count' => 'Number of rules and rule groups', 'tags_count' => 'Number of tags', -]; \ No newline at end of file +]; diff --git a/resources/lang/hr_HR/pagination.php b/resources/lang/hr_HR/pagination.php index 0efae8cb62..0d6df7e178 100644 --- a/resources/lang/hr_HR/pagination.php +++ b/resources/lang/hr_HR/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« Prethodna', 'next' => 'Sljedeća »', -]; \ No newline at end of file +]; diff --git a/resources/lang/hr_HR/passwords.php b/resources/lang/hr_HR/passwords.php index 80362c2eca..93f1918c4e 100644 --- a/resources/lang/hr_HR/passwords.php +++ b/resources/lang/hr_HR/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => 'Na e-mail smo ti poslali poveznicu za promjenu lozinke!', 'reset' => 'Tvoja lozinka je promijenjena!', 'blocked' => 'Lijep pokušaj.', -]; \ No newline at end of file +]; diff --git a/resources/lang/hr_HR/validation.php b/resources/lang/hr_HR/validation.php index addd0e6f39..ea21edefe4 100644 --- a/resources/lang/hr_HR/validation.php +++ b/resources/lang/hr_HR/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => 'The :attribute field does not exist in :other.', 'present' => 'The :attribute field must be present.', 'amount_zero' => 'The total amount cannot be zero', -]; \ No newline at end of file +]; diff --git a/resources/lang/nl_NL/auth.php b/resources/lang/nl_NL/auth.php index f046afaa6e..ea6e4eba7f 100644 --- a/resources/lang/nl_NL/auth.php +++ b/resources/lang/nl_NL/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => 'Deze gegevens zijn niet correct.', 'throttle' => 'Te veel inlogpogingen. Probeer opnieuw in: seconden seconden.', -]; \ No newline at end of file +]; diff --git a/resources/lang/nl_NL/breadcrumbs.php b/resources/lang/nl_NL/breadcrumbs.php index 915aae7995..b163e9ed68 100644 --- a/resources/lang/nl_NL/breadcrumbs.php +++ b/resources/lang/nl_NL/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => 'Maak nieuwe tag', 'edit_tag' => 'Wijzig tag ":tag"', 'delete_tag' => 'Verwijder tag ":tag"', -]; \ No newline at end of file +]; diff --git a/resources/lang/nl_NL/config.php b/resources/lang/nl_NL/config.php index d27314468a..1680ae558a 100644 --- a/resources/lang/nl_NL/config.php +++ b/resources/lang/nl_NL/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; \ No newline at end of file +]; diff --git a/resources/lang/nl_NL/csv.php b/resources/lang/nl_NL/csv.php index 876ca796a4..a50e4dd193 100644 --- a/resources/lang/nl_NL/csv.php +++ b/resources/lang/nl_NL/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (spatiegescheiden)', 'column_account-number' => 'Betaalrekening (rekeningnummer)', 'column_opposing-number' => 'Tegenrekening (rekeningnummer)', -]; \ No newline at end of file +]; diff --git a/resources/lang/nl_NL/demo.php b/resources/lang/nl_NL/demo.php index ff2c7b4b54..f50aa30c9a 100644 --- a/resources/lang/nl_NL/demo.php +++ b/resources/lang/nl_NL/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Of course, any CSV file can be imported into Firefly III ', 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.', 'import-configure-configuration' => 'The configuration you see below is correct for the local file.', -]; \ No newline at end of file +]; diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 65b5810fb7..f5c9ccebf7 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -959,4 +959,4 @@ return [ 'import_finished_intro' => 'De import is klaar! Je kan de transacties nu terugvinden in Firefly.', 'import_finished_text_without_link' => 'Er is geen tag die al je transacties bevat. Kijk links in het menu onder "Transacties" en zoek daar je nieuwe transacties op.', 'import_finished_text_with_link' => 'Je kan je geïmporteerde transacties op deze pagina terug vinden.', -]; \ No newline at end of file +]; diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php index c3a5997cea..2e075be59a 100644 --- a/resources/lang/nl_NL/form.php +++ b/resources/lang/nl_NL/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Betalingsdatum', 'invoice_date' => 'Factuurdatum', 'internal_reference' => 'Interne verwijzing', -]; \ No newline at end of file +]; diff --git a/resources/lang/nl_NL/help.php b/resources/lang/nl_NL/help.php index 9ca29221ad..2b4b79b2f9 100644 --- a/resources/lang/nl_NL/help.php +++ b/resources/lang/nl_NL/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => 'Elke pagina heeft een vraagtekentje rechtsboven. Gebruik deze voor meer hulp. Veel plezier!', 'index' => 'index', 'home' => 'home', -]; \ No newline at end of file +]; diff --git a/resources/lang/nl_NL/list.php b/resources/lang/nl_NL/list.php index 95efafc5d6..2eeeb69f34 100644 --- a/resources/lang/nl_NL/list.php +++ b/resources/lang/nl_NL/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Aantal budgetten', 'rule_and_groups_count' => 'Aantal regels en regelgroepen', 'tags_count' => 'Aantal tags', -]; \ No newline at end of file +]; diff --git a/resources/lang/nl_NL/pagination.php b/resources/lang/nl_NL/pagination.php index 02de2ab65b..df407a1708 100644 --- a/resources/lang/nl_NL/pagination.php +++ b/resources/lang/nl_NL/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« Vorige', 'next' => 'Volgende »', -]; \ No newline at end of file +]; diff --git a/resources/lang/nl_NL/passwords.php b/resources/lang/nl_NL/passwords.php index 3839a12e68..0e6bcd3176 100644 --- a/resources/lang/nl_NL/passwords.php +++ b/resources/lang/nl_NL/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => 'Je krijgt een mailtje met een linkje om je wachtwoord te herstellen!', 'reset' => 'Je wachtwoord is hersteld!', 'blocked' => 'Leuk geprobeerd wel.', -]; \ No newline at end of file +]; diff --git a/resources/lang/nl_NL/validation.php b/resources/lang/nl_NL/validation.php index 7533fe6848..4cc89b2fb5 100644 --- a/resources/lang/nl_NL/validation.php +++ b/resources/lang/nl_NL/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => 'Het :attribute veld bestaat niet in :other.', 'present' => 'Het :attribute veld moet aanwezig zijn.', 'amount_zero' => 'Het totaalbedrag kan niet nul zijn', -]; \ No newline at end of file +]; diff --git a/resources/lang/pl_PL/auth.php b/resources/lang/pl_PL/auth.php index a7b55af932..dabd854a8e 100644 --- a/resources/lang/pl_PL/auth.php +++ b/resources/lang/pl_PL/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => 'Te poświadczenia nie zgadzają się z naszymi danymi.', 'throttle' => 'Zbyt wiele prób logowania. Spróbuj ponownie za :seconds sekund.', -]; \ No newline at end of file +]; diff --git a/resources/lang/pl_PL/breadcrumbs.php b/resources/lang/pl_PL/breadcrumbs.php index 210aab7ca0..fbd869f96d 100644 --- a/resources/lang/pl_PL/breadcrumbs.php +++ b/resources/lang/pl_PL/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => 'Utwórz nowy tag', 'edit_tag' => 'Modyfikuj tag ":tag"', 'delete_tag' => 'Usuń tag ":tag"', -]; \ No newline at end of file +]; diff --git a/resources/lang/pl_PL/config.php b/resources/lang/pl_PL/config.php index 29dfe740f4..6acc711d2b 100644 --- a/resources/lang/pl_PL/config.php +++ b/resources/lang/pl_PL/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; \ No newline at end of file +]; diff --git a/resources/lang/pl_PL/csv.php b/resources/lang/pl_PL/csv.php index d9b1b88c79..96e5ce2148 100644 --- a/resources/lang/pl_PL/csv.php +++ b/resources/lang/pl_PL/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tagi (oddzielone spacjami)', 'column_account-number' => 'Konto aktywów (numer konta)', 'column_opposing-number' => 'Opposing account (account number)', -]; \ No newline at end of file +]; diff --git a/resources/lang/pl_PL/demo.php b/resources/lang/pl_PL/demo.php index 5e19d0ed45..623854e8e0 100644 --- a/resources/lang/pl_PL/demo.php +++ b/resources/lang/pl_PL/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Of course, any CSV file can be imported into Firefly III ', 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.', 'import-configure-configuration' => 'Konfiguracja, która widzisz poniżej jest prawidłowa dla lokalnego pliku.', -]; \ No newline at end of file +]; diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php index d101e6129f..347351bd19 100644 --- a/resources/lang/pl_PL/firefly.php +++ b/resources/lang/pl_PL/firefly.php @@ -959,4 +959,4 @@ return [ 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', -]; \ No newline at end of file +]; diff --git a/resources/lang/pl_PL/form.php b/resources/lang/pl_PL/form.php index e5466680b7..792e53c89d 100644 --- a/resources/lang/pl_PL/form.php +++ b/resources/lang/pl_PL/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Data płatności', 'invoice_date' => 'Data faktury', 'internal_reference' => 'Internal reference', -]; \ No newline at end of file +]; diff --git a/resources/lang/pl_PL/help.php b/resources/lang/pl_PL/help.php index 8b73dbc51d..0639bfeea4 100644 --- a/resources/lang/pl_PL/help.php +++ b/resources/lang/pl_PL/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => 'Pamiętaj, że każda strona ma małą ikonkę ze znakiem zapytania w prawym górnym rogu. Kliknij ją aby otrzymać dodatkowe informacje o stronie, na której się znajdujesz.', 'index' => 'indeks', 'home' => 'początek', -]; \ No newline at end of file +]; diff --git a/resources/lang/pl_PL/list.php b/resources/lang/pl_PL/list.php index 0ce37d9346..1de98adf48 100644 --- a/resources/lang/pl_PL/list.php +++ b/resources/lang/pl_PL/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Liczba budżetów', 'rule_and_groups_count' => 'Liczba reguł i grup reguł', 'tags_count' => 'Liczba tagów', -]; \ No newline at end of file +]; diff --git a/resources/lang/pl_PL/pagination.php b/resources/lang/pl_PL/pagination.php index f666586cef..0cdbd60741 100644 --- a/resources/lang/pl_PL/pagination.php +++ b/resources/lang/pl_PL/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« Poprzednia', 'next' => 'Następna »', -]; \ No newline at end of file +]; diff --git a/resources/lang/pl_PL/passwords.php b/resources/lang/pl_PL/passwords.php index f3d2d44d09..64141c8686 100644 --- a/resources/lang/pl_PL/passwords.php +++ b/resources/lang/pl_PL/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => 'Wysłaliśmy link do resetowania hasła na twój adres email!', 'reset' => 'Twoje hasło zostało zresetowane!', 'blocked' => 'Przynajmniej próbowałeś.', -]; \ No newline at end of file +]; diff --git a/resources/lang/pl_PL/validation.php b/resources/lang/pl_PL/validation.php index 107f70fe31..f1ad408cb7 100644 --- a/resources/lang/pl_PL/validation.php +++ b/resources/lang/pl_PL/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => 'Pole :attribute nie istnieje w :other.', 'present' => 'Pole :attribute musi być obecne.', 'amount_zero' => 'Całkowita kwota nie może być zerem', -]; \ No newline at end of file +]; diff --git a/resources/lang/pt_BR/auth.php b/resources/lang/pt_BR/auth.php index 5a17d21cad..15a40c990b 100644 --- a/resources/lang/pt_BR/auth.php +++ b/resources/lang/pt_BR/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => 'Essas credenciais não correspondem aos nossos registros.', 'throttle' => 'Muitas tentativas de login. Por favor, tente novamente em :seconds segundos.', -]; \ No newline at end of file +]; diff --git a/resources/lang/pt_BR/breadcrumbs.php b/resources/lang/pt_BR/breadcrumbs.php index cd6c42b790..6f8a0fbefe 100644 --- a/resources/lang/pt_BR/breadcrumbs.php +++ b/resources/lang/pt_BR/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => 'Criar nova etiqueta', 'edit_tag' => 'Editar etiqueta ":tag"', 'delete_tag' => 'Apagar etiqueta ":tag"', -]; \ No newline at end of file +]; diff --git a/resources/lang/pt_BR/config.php b/resources/lang/pt_BR/config.php index 1800829bde..3a6582b8d2 100644 --- a/resources/lang/pt_BR/config.php +++ b/resources/lang/pt_BR/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; \ No newline at end of file +]; diff --git a/resources/lang/pt_BR/csv.php b/resources/lang/pt_BR/csv.php index a1b92485f2..aca1e7ebc2 100644 --- a/resources/lang/pt_BR/csv.php +++ b/resources/lang/pt_BR/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (separadas por espaço)', 'column_account-number' => 'Conta de ativo (número da conta)', 'column_opposing-number' => 'Conta Contrária (número da conta)', -]; \ No newline at end of file +]; diff --git a/resources/lang/pt_BR/demo.php b/resources/lang/pt_BR/demo.php index 559620fedf..4842ffa8fe 100644 --- a/resources/lang/pt_BR/demo.php +++ b/resources/lang/pt_BR/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Claro, qualquer arquivo .CSV pode ser importado em Firefly III ', 'import-configure-security' => 'Por questões de segurança, seu upload foi substituído por um arquivo local.', 'import-configure-configuration' => 'A configuração que você vê abaixo é a correta para o arquivo local.', -]; \ No newline at end of file +]; diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index 6d270fdea5..9cfa513247 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -959,4 +959,4 @@ return [ 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', -]; \ No newline at end of file +]; diff --git a/resources/lang/pt_BR/form.php b/resources/lang/pt_BR/form.php index 4d7a1cae62..62f0fbdca9 100644 --- a/resources/lang/pt_BR/form.php +++ b/resources/lang/pt_BR/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Data de pagamento', 'invoice_date' => 'Data da Fatura', 'internal_reference' => 'Referência interna', -]; \ No newline at end of file +]; diff --git a/resources/lang/pt_BR/help.php b/resources/lang/pt_BR/help.php index 83268848f9..877259b46b 100644 --- a/resources/lang/pt_BR/help.php +++ b/resources/lang/pt_BR/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => 'Lembre-se que cada página tem um pequeno ponto de interrogação na parte superior direita. Clique nele para obter ajuda sobre a página que você está.', 'index' => 'índice', 'home' => 'casa', -]; \ No newline at end of file +]; diff --git a/resources/lang/pt_BR/list.php b/resources/lang/pt_BR/list.php index 4cc4bbbd49..548fc9cabe 100644 --- a/resources/lang/pt_BR/list.php +++ b/resources/lang/pt_BR/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Número de orçamentos', 'rule_and_groups_count' => 'Número de regras e grupos de regras', 'tags_count' => 'Número de tags', -]; \ No newline at end of file +]; diff --git a/resources/lang/pt_BR/pagination.php b/resources/lang/pt_BR/pagination.php index f16e5f9bb1..7849521349 100644 --- a/resources/lang/pt_BR/pagination.php +++ b/resources/lang/pt_BR/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« Anterior', 'next' => 'Próximo »', -]; \ No newline at end of file +]; diff --git a/resources/lang/pt_BR/passwords.php b/resources/lang/pt_BR/passwords.php index d167089a72..24863232a1 100644 --- a/resources/lang/pt_BR/passwords.php +++ b/resources/lang/pt_BR/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => 'Nós te enviamos um email com um link para trocar a senha!', 'reset' => 'Sua senha foi redefinida!', 'blocked' => 'Boa tentativa.', -]; \ No newline at end of file +]; diff --git a/resources/lang/pt_BR/validation.php b/resources/lang/pt_BR/validation.php index 3e4891f349..527734719f 100644 --- a/resources/lang/pt_BR/validation.php +++ b/resources/lang/pt_BR/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => 'O campo :attribute não existe em :other.', 'present' => 'O campo :attribute deve estar presente.', 'amount_zero' => 'A quantidade total não pode ser zero', -]; \ No newline at end of file +]; diff --git a/resources/lang/ru_RU/auth.php b/resources/lang/ru_RU/auth.php index bc725bca9b..715498e97b 100644 --- a/resources/lang/ru_RU/auth.php +++ b/resources/lang/ru_RU/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => 'Неправильный адрес электронной почты или пароль.', 'throttle' => 'Слишком много попыток логина. Пожалуйста, попробуйте снова через :seconds секунд.', -]; \ No newline at end of file +]; diff --git a/resources/lang/ru_RU/breadcrumbs.php b/resources/lang/ru_RU/breadcrumbs.php index 646511cec4..317c52461b 100644 --- a/resources/lang/ru_RU/breadcrumbs.php +++ b/resources/lang/ru_RU/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => 'Создать новый тег', 'edit_tag' => 'Редактировать тег ":tag"', 'delete_tag' => 'Удалить тег ":tag"', -]; \ No newline at end of file +]; diff --git a/resources/lang/ru_RU/config.php b/resources/lang/ru_RU/config.php index 5544349117..668f45deb4 100644 --- a/resources/lang/ru_RU/config.php +++ b/resources/lang/ru_RU/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; \ No newline at end of file +]; diff --git a/resources/lang/ru_RU/csv.php b/resources/lang/ru_RU/csv.php index 37e4e88998..2340f76ea4 100644 --- a/resources/lang/ru_RU/csv.php +++ b/resources/lang/ru_RU/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (space separated)', 'column_account-number' => 'Asset account (account number)', 'column_opposing-number' => 'Opposing account (account number)', -]; \ No newline at end of file +]; diff --git a/resources/lang/ru_RU/demo.php b/resources/lang/ru_RU/demo.php index e7f8ea934d..3efa9c60a3 100644 --- a/resources/lang/ru_RU/demo.php +++ b/resources/lang/ru_RU/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Of course, any CSV file can be imported into Firefly III ', 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.', 'import-configure-configuration' => 'The configuration you see below is correct for the local file.', -]; \ No newline at end of file +]; diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php index a91170cd53..d54d34d4a6 100644 --- a/resources/lang/ru_RU/firefly.php +++ b/resources/lang/ru_RU/firefly.php @@ -959,4 +959,4 @@ return [ 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', -]; \ No newline at end of file +]; diff --git a/resources/lang/ru_RU/form.php b/resources/lang/ru_RU/form.php index ff44cbf9ef..271005bc4f 100644 --- a/resources/lang/ru_RU/form.php +++ b/resources/lang/ru_RU/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Payment date', 'invoice_date' => 'Invoice date', 'internal_reference' => 'Internal reference', -]; \ No newline at end of file +]; diff --git a/resources/lang/ru_RU/help.php b/resources/lang/ru_RU/help.php index 61210ffe41..5198e5510f 100644 --- a/resources/lang/ru_RU/help.php +++ b/resources/lang/ru_RU/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.', 'index' => 'index', 'home' => 'home', -]; \ No newline at end of file +]; diff --git a/resources/lang/ru_RU/list.php b/resources/lang/ru_RU/list.php index 90625d54e6..91254e401d 100644 --- a/resources/lang/ru_RU/list.php +++ b/resources/lang/ru_RU/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Number of budgets', 'rule_and_groups_count' => 'Number of rules and rule groups', 'tags_count' => 'Number of tags', -]; \ No newline at end of file +]; diff --git a/resources/lang/ru_RU/pagination.php b/resources/lang/ru_RU/pagination.php index 4eeab21dee..9e61a6cfcc 100644 --- a/resources/lang/ru_RU/pagination.php +++ b/resources/lang/ru_RU/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« Previous', 'next' => 'Next »', -]; \ No newline at end of file +]; diff --git a/resources/lang/ru_RU/passwords.php b/resources/lang/ru_RU/passwords.php index 2e11aa92dc..8e1b72506b 100644 --- a/resources/lang/ru_RU/passwords.php +++ b/resources/lang/ru_RU/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => 'We have e-mailed your password reset link!', 'reset' => 'Your password has been reset!', 'blocked' => 'Nice try though.', -]; \ No newline at end of file +]; diff --git a/resources/lang/ru_RU/validation.php b/resources/lang/ru_RU/validation.php index addd0e6f39..ea21edefe4 100644 --- a/resources/lang/ru_RU/validation.php +++ b/resources/lang/ru_RU/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => 'The :attribute field does not exist in :other.', 'present' => 'The :attribute field must be present.', 'amount_zero' => 'The total amount cannot be zero', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_HK/auth.php b/resources/lang/zh_HK/auth.php index 5d833b3d68..7319a9d7b8 100644 --- a/resources/lang/zh_HK/auth.php +++ b/resources/lang/zh_HK/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => 'These credentials do not match our records.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_HK/breadcrumbs.php b/resources/lang/zh_HK/breadcrumbs.php index 6bcf9b862d..54cb260179 100644 --- a/resources/lang/zh_HK/breadcrumbs.php +++ b/resources/lang/zh_HK/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => 'Create new tag', 'edit_tag' => 'Edit tag ":tag"', 'delete_tag' => 'Delete tag ":tag"', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_HK/config.php b/resources/lang/zh_HK/config.php index 58220429bf..0c23d3f6cd 100644 --- a/resources/lang/zh_HK/config.php +++ b/resources/lang/zh_HK/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_HK/csv.php b/resources/lang/zh_HK/csv.php index 4acb52efdc..6b5abd3431 100644 --- a/resources/lang/zh_HK/csv.php +++ b/resources/lang/zh_HK/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (space separated)', 'column_account-number' => 'Asset account (account number)', 'column_opposing-number' => 'Opposing account (account number)', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_HK/demo.php b/resources/lang/zh_HK/demo.php index e7f8ea934d..3efa9c60a3 100644 --- a/resources/lang/zh_HK/demo.php +++ b/resources/lang/zh_HK/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Of course, any CSV file can be imported into Firefly III ', 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.', 'import-configure-configuration' => 'The configuration you see below is correct for the local file.', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php index a91170cd53..d54d34d4a6 100644 --- a/resources/lang/zh_HK/firefly.php +++ b/resources/lang/zh_HK/firefly.php @@ -959,4 +959,4 @@ return [ 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_HK/form.php b/resources/lang/zh_HK/form.php index ff44cbf9ef..271005bc4f 100644 --- a/resources/lang/zh_HK/form.php +++ b/resources/lang/zh_HK/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Payment date', 'invoice_date' => 'Invoice date', 'internal_reference' => 'Internal reference', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_HK/help.php b/resources/lang/zh_HK/help.php index 61210ffe41..5198e5510f 100644 --- a/resources/lang/zh_HK/help.php +++ b/resources/lang/zh_HK/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.', 'index' => 'index', 'home' => 'home', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_HK/list.php b/resources/lang/zh_HK/list.php index 90625d54e6..91254e401d 100644 --- a/resources/lang/zh_HK/list.php +++ b/resources/lang/zh_HK/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Number of budgets', 'rule_and_groups_count' => 'Number of rules and rule groups', 'tags_count' => 'Number of tags', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_HK/pagination.php b/resources/lang/zh_HK/pagination.php index 4eeab21dee..9e61a6cfcc 100644 --- a/resources/lang/zh_HK/pagination.php +++ b/resources/lang/zh_HK/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« Previous', 'next' => 'Next »', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_HK/passwords.php b/resources/lang/zh_HK/passwords.php index 2e11aa92dc..8e1b72506b 100644 --- a/resources/lang/zh_HK/passwords.php +++ b/resources/lang/zh_HK/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => 'We have e-mailed your password reset link!', 'reset' => 'Your password has been reset!', 'blocked' => 'Nice try though.', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_HK/validation.php b/resources/lang/zh_HK/validation.php index addd0e6f39..ea21edefe4 100644 --- a/resources/lang/zh_HK/validation.php +++ b/resources/lang/zh_HK/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => 'The :attribute field does not exist in :other.', 'present' => 'The :attribute field must be present.', 'amount_zero' => 'The total amount cannot be zero', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_TW/auth.php b/resources/lang/zh_TW/auth.php index 7a20761eea..8278daa0a3 100644 --- a/resources/lang/zh_TW/auth.php +++ b/resources/lang/zh_TW/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => '帳號或密碼錯誤。', 'throttle' => '登入失敗次數過多，請等待 :seconds 秒後再試。', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_TW/breadcrumbs.php b/resources/lang/zh_TW/breadcrumbs.php index d9fe1aac5b..a5fe3d1755 100644 --- a/resources/lang/zh_TW/breadcrumbs.php +++ b/resources/lang/zh_TW/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => '建立新標籤', 'edit_tag' => '編輯標籤 ":tag"', 'delete_tag' => '刪除標籤 ":tag"', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_TW/config.php b/resources/lang/zh_TW/config.php index 8e724f5689..6e4ea6871a 100644 --- a/resources/lang/zh_TW/config.php +++ b/resources/lang/zh_TW/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_TW/csv.php b/resources/lang/zh_TW/csv.php index e94574c27b..f87f951bba 100644 --- a/resources/lang/zh_TW/csv.php +++ b/resources/lang/zh_TW/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => '標籤 （空格分隔）', 'column_account-number' => '資產帳戶 （帳號號碼）', 'column_opposing-number' => '抵銷的帳戶 （帳號號碼）', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_TW/demo.php b/resources/lang/zh_TW/demo.php index e7f8ea934d..3efa9c60a3 100644 --- a/resources/lang/zh_TW/demo.php +++ b/resources/lang/zh_TW/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Of course, any CSV file can be imported into Firefly III ', 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.', 'import-configure-configuration' => 'The configuration you see below is correct for the local file.', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index 9fddfcf9d8..22ad08e150 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -959,4 +959,4 @@ return [ 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_TW/form.php b/resources/lang/zh_TW/form.php index 1c04418238..9014884592 100644 --- a/resources/lang/zh_TW/form.php +++ b/resources/lang/zh_TW/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Payment date', 'invoice_date' => 'Invoice date', 'internal_reference' => 'Internal reference', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_TW/help.php b/resources/lang/zh_TW/help.php index 69a62018c7..8175c162da 100644 --- a/resources/lang/zh_TW/help.php +++ b/resources/lang/zh_TW/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => '每一頁在右上方有一個小問號。按一下它可以取得與頁面相關説明。', 'index' => '首頁', 'home' => '首頁', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_TW/list.php b/resources/lang/zh_TW/list.php index d5df766461..d90f353626 100644 --- a/resources/lang/zh_TW/list.php +++ b/resources/lang/zh_TW/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Number of budgets', 'rule_and_groups_count' => 'Number of rules and rule groups', 'tags_count' => 'Number of tags', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_TW/pagination.php b/resources/lang/zh_TW/pagination.php index a197fb74af..d87b6631ad 100644 --- a/resources/lang/zh_TW/pagination.php +++ b/resources/lang/zh_TW/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« 上一頁', 'next' => '下一頁 »', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_TW/passwords.php b/resources/lang/zh_TW/passwords.php index ae5f0cc2a9..4f28fe3fb0 100644 --- a/resources/lang/zh_TW/passwords.php +++ b/resources/lang/zh_TW/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => '我們已經將密碼重置連結發送至您的電郵！', 'reset' => '你的密碼已經被重置！', 'blocked' => '好一個嘗試。', -]; \ No newline at end of file +]; diff --git a/resources/lang/zh_TW/validation.php b/resources/lang/zh_TW/validation.php index f1593f0b18..de535f4652 100644 --- a/resources/lang/zh_TW/validation.php +++ b/resources/lang/zh_TW/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => 'The :attribute field does not exist in :other.', 'present' => 'The :attribute field must be present.', 'amount_zero' => 'The total amount cannot be zero', -]; \ No newline at end of file +]; diff --git a/resources/views/accounts/create.twig b/resources/views/accounts/create.twig index 07e55d4f55..171ae13b1e 100644 --- a/resources/views/accounts/create.twig +++ b/resources/views/accounts/create.twig @@ -76,4 +76,4 @@ {% block styles %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/resources/views/accounts/edit.twig b/resources/views/accounts/edit.twig index 29cd807ac2..e01e7f98ee 100644 --- a/resources/views/accounts/edit.twig +++ b/resources/views/accounts/edit.twig @@ -86,4 +86,4 @@ {% block styles %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/resources/views/demo/accounts/index.twig b/resources/views/demo/accounts/index.twig index 1e42bbc675..9d3cf18a02 100644 --- a/resources/views/demo/accounts/index.twig +++ b/resources/views/demo/accounts/index.twig @@ -1 +1 @@ -{{ trans('demo.accounts-index') }} \ No newline at end of file +{{ trans('demo.accounts-index') }} diff --git a/resources/views/demo/budgets/index.twig b/resources/views/demo/budgets/index.twig index 737932b3df..5717ecfce4 100644 --- a/resources/views/demo/budgets/index.twig +++ b/resources/views/demo/budgets/index.twig @@ -1 +1 @@ -{{ trans('demo.budgets-index') }} \ No newline at end of file +{{ trans('demo.budgets-index') }} diff --git a/resources/views/demo/currencies/index.twig b/resources/views/demo/currencies/index.twig index 9d155e1181..1ea152a0f2 100644 --- a/resources/views/demo/currencies/index.twig +++ b/resources/views/demo/currencies/index.twig @@ -1 +1 @@ -{{ trans('demo.currencies-index') }} \ No newline at end of file +{{ trans('demo.currencies-index') }} diff --git a/resources/views/demo/home.twig b/resources/views/demo/home.twig index 84f855689a..85268e795a 100644 --- a/resources/views/demo/home.twig +++ b/resources/views/demo/home.twig @@ -1 +1 @@ -{{ trans('demo.index', {asset: route('accounts.index', ['asset']), budgets: route('budgets.index'), reports: route('reports.index')})|raw }} \ No newline at end of file +{{ trans('demo.index', {asset: route('accounts.index', ['asset']), budgets: route('budgets.index'), reports: route('reports.index')})|raw }} diff --git a/resources/views/demo/import/configure.twig b/resources/views/demo/import/configure.twig index 1d5adc6a31..a94b4914bb 100644 --- a/resources/views/demo/import/configure.twig +++ b/resources/views/demo/import/configure.twig @@ -1,3 +1,3 @@ {{ trans('demo.import-configure-security') }}

                                                                                                                                                                                              -{{ trans('demo.import-configure-configuration') }} \ No newline at end of file +{{ trans('demo.import-configure-configuration') }} diff --git a/resources/views/demo/import/index.twig b/resources/views/demo/import/index.twig index 00e5a8d4ce..31fe3ab386 100644 --- a/resources/views/demo/import/index.twig +++ b/resources/views/demo/import/index.twig @@ -1 +1 @@ -{{ trans('demo.import-index') }} \ No newline at end of file +{{ trans('demo.import-index') }} diff --git a/resources/views/demo/index.twig b/resources/views/demo/index.twig index 84f855689a..85268e795a 100644 --- a/resources/views/demo/index.twig +++ b/resources/views/demo/index.twig @@ -1 +1 @@ -{{ trans('demo.index', {asset: route('accounts.index', ['asset']), budgets: route('budgets.index'), reports: route('reports.index')})|raw }} \ No newline at end of file +{{ trans('demo.index', {asset: route('accounts.index', ['asset']), budgets: route('budgets.index'), reports: route('reports.index')})|raw }} diff --git a/resources/views/demo/piggy-banks/index.twig b/resources/views/demo/piggy-banks/index.twig index ea776d4f25..7c0415fc31 100644 --- a/resources/views/demo/piggy-banks/index.twig +++ b/resources/views/demo/piggy-banks/index.twig @@ -1 +1 @@ -{{ trans('demo.piggy-banks-index') }} \ No newline at end of file +{{ trans('demo.piggy-banks-index') }} diff --git a/resources/views/demo/reports/index.twig b/resources/views/demo/reports/index.twig index c7d5d9aab4..535fb63c44 100644 --- a/resources/views/demo/reports/index.twig +++ b/resources/views/demo/reports/index.twig @@ -4,4 +4,4 @@ {{ trans('demo.reports-index-examples', { one: route('reports.report.default', ['1,2,3','currentMonthStart','currentMonthEnd']), two: route('reports.report.default', ['1,2,3','20160101','20161231']), - three: route('reports.report.budget', ['1,2,3','2,1','20160101','20161231'])})|raw }} \ No newline at end of file + three: route('reports.report.budget', ['1,2,3','2,1','20160101','20161231'])})|raw }} diff --git a/resources/views/demo/transactions/index.twig b/resources/views/demo/transactions/index.twig index 8a212172ce..247ad41218 100644 --- a/resources/views/demo/transactions/index.twig +++ b/resources/views/demo/transactions/index.twig @@ -1 +1 @@ -{{ trans('demo.transactions-index') }} \ No newline at end of file +{{ trans('demo.transactions-index') }} diff --git a/resources/views/export/index.twig b/resources/views/export/index.twig index afe83f4c9c..3ebcc538ea 100644 --- a/resources/views/export/index.twig +++ b/resources/views/export/index.twig @@ -107,4 +107,4 @@ {% block styles %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/resources/views/javascript/variables.twig b/resources/views/javascript/variables.twig index 5fe2a12f60..6e02953236 100644 --- a/resources/views/javascript/variables.twig +++ b/resources/views/javascript/variables.twig @@ -27,4 +27,4 @@ var noDataForChart = '{{ trans('firefly.no_data_for_chart')|escape }}'; var showFullList = '{{ trans('firefly.show_full_list') }}'; var showOnlyTop = '{{ trans('firefly.show_only_top',{number:listLength}) }}'; var accountingConfig = {{ accounting|json_encode|raw }}; -var token = '{{ csrf_token() }}'; \ No newline at end of file +var token = '{{ csrf_token() }}'; diff --git a/resources/views/piggy-banks/create.twig b/resources/views/piggy-banks/create.twig index e144dc9838..b9e132dea0 100644 --- a/resources/views/piggy-banks/create.twig +++ b/resources/views/piggy-banks/create.twig @@ -63,4 +63,4 @@ {% block styles %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/resources/views/piggy-banks/edit.twig b/resources/views/piggy-banks/edit.twig index df25b8aebc..85f225c05b 100644 --- a/resources/views/piggy-banks/edit.twig +++ b/resources/views/piggy-banks/edit.twig @@ -65,4 +65,4 @@ {% block styles %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/resources/views/preferences/index.twig b/resources/views/preferences/index.twig index 5432d9887f..0b00562525 100644 --- a/resources/views/preferences/index.twig +++ b/resources/views/preferences/index.twig @@ -281,4 +281,4 @@ {% block styles %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/resources/views/reports/options/category.twig b/resources/views/reports/options/category.twig index 126467ca26..665e60421e 100644 --- a/resources/views/reports/options/category.twig +++ b/resources/views/reports/options/category.twig @@ -5,4 +5,4 @@ {% for category in categories %} {% endfor %} - \ No newline at end of file + diff --git a/resources/views/rules/rule-group/select-transactions.twig b/resources/views/rules/rule-group/select-transactions.twig index e33b186cd9..b12e7fb14f 100644 --- a/resources/views/rules/rule-group/select-transactions.twig +++ b/resources/views/rules/rule-group/select-transactions.twig @@ -49,4 +49,4 @@ {% block styles %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/resources/views/tags/create.twig b/resources/views/tags/create.twig index 8d85dcc86a..bf78d6c3c6 100644 --- a/resources/views/tags/create.twig +++ b/resources/views/tags/create.twig @@ -91,4 +91,4 @@ {% block styles %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/resources/views/tags/edit.twig b/resources/views/tags/edit.twig index 4012de4137..dcf7557d85 100644 --- a/resources/views/tags/edit.twig +++ b/resources/views/tags/edit.twig @@ -94,4 +94,4 @@ {% block styles %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php index 8d8a77e99d..547152f6a9 100644 --- a/tests/CreatesApplication.php +++ b/tests/CreatesApplication.php @@ -19,4 +19,4 @@ trait CreatesApplication return $app; } -} \ No newline at end of file +} diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php index c23bfc63d5..486dc271a3 100644 --- a/tests/Feature/ExampleTest.php +++ b/tests/Feature/ExampleTest.php @@ -20,4 +20,4 @@ class ExampleTest extends TestCase $response->assertStatus(200); } -} \ No newline at end of file +} diff --git a/tests/TestCase.php b/tests/TestCase.php index 03cde96b56..51b7cf0735 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -12,4 +12,4 @@ use Illuminate\Foundation\Testing\TestCase as BaseTestCase; abstract class TestCase extends BaseTestCase { use CreatesApplication; -} \ No newline at end of file +} diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php index 239346394a..5663bb49f8 100644 --- a/tests/Unit/ExampleTest.php +++ b/tests/Unit/ExampleTest.php @@ -17,4 +17,4 @@ class ExampleTest extends TestCase { $this->assertTrue(true); } -} \ No newline at end of file +} From b2026106ec32c59e4bfe5a3cfea29b0840891da4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Feb 2017 08:29:18 +0100 Subject: [PATCH 046/276] Update config.php, see #521 --- resources/lang/en_US/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en_US/config.php b/resources/lang/en_US/config.php index 0c23d3f6cd..b5ed958eca 100644 --- a/resources/lang/en_US/config.php +++ b/resources/lang/en_US/config.php @@ -10,7 +10,7 @@ */ return [ - 'locale' => 'en, English, en_US, en_US.utf8', + 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%B %e, %Y', 'date_time' => '%B %e, %Y, @ %T', From 7d8b3e6513afc62f6bc46ded2ee2cc2eca71093d Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Feb 2017 08:31:40 +0100 Subject: [PATCH 047/276] New translations --- resources/lang/hr_HR/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/hr_HR/config.php b/resources/lang/hr_HR/config.php index aed39872de..1c11063285 100644 --- a/resources/lang/hr_HR/config.php +++ b/resources/lang/hr_HR/config.php @@ -10,7 +10,7 @@ */ return [ - 'locale' => 'hr, Croatian, hr_HR, hr_HR.utf8', + 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%e %B %Y', 'date_time' => '%e %B %Y, @ %T', From 796b63fcc515369e70b9b84e779fe5e4a3983c1e Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Feb 2017 08:31:42 +0100 Subject: [PATCH 048/276] New translations --- resources/lang/zh_HK/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_HK/config.php b/resources/lang/zh_HK/config.php index 58220429bf..827ebea3f0 100644 --- a/resources/lang/zh_HK/config.php +++ b/resources/lang/zh_HK/config.php @@ -10,7 +10,7 @@ */ return [ - 'locale' => 'en, English, en_US, en_US.utf8', + 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%B %e, %Y', 'date_time' => '%B %e, %Y, @ %T', From 451ab6c5319267a8e2b326a4e1ca2a8cedea6289 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Feb 2017 08:31:48 +0100 Subject: [PATCH 049/276] New translations --- resources/lang/zh_TW/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_TW/config.php b/resources/lang/zh_TW/config.php index 8e724f5689..827ebea3f0 100644 --- a/resources/lang/zh_TW/config.php +++ b/resources/lang/zh_TW/config.php @@ -10,7 +10,7 @@ */ return [ - 'locale' => 'en, English, en_US, en_US.utf8 test', + 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%B %e, %Y', 'date_time' => '%B %e, %Y, @ %T', From f2ea5fb2533f547ab2718de928e78fe884f919bc Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Feb 2017 08:31:57 +0100 Subject: [PATCH 050/276] New translations --- resources/lang/fr_FR/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/config.php b/resources/lang/fr_FR/config.php index 9ddc4761b8..f44be30df9 100644 --- a/resources/lang/fr_FR/config.php +++ b/resources/lang/fr_FR/config.php @@ -10,7 +10,7 @@ */ return [ - 'locale' => 'fr, French, fr_FR, fr_FR.utf8', + 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%e %B %Y', 'date_time' => '%B %e %Y @ %T', From 7d8012061121624d6bdd590a69d1d005afb30f65 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Feb 2017 08:32:09 +0100 Subject: [PATCH 051/276] Approved. Step name: Proofread --- resources/lang/nl_NL/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/nl_NL/config.php b/resources/lang/nl_NL/config.php index d27314468a..3b2420384f 100644 --- a/resources/lang/nl_NL/config.php +++ b/resources/lang/nl_NL/config.php @@ -10,7 +10,7 @@ */ return [ - 'locale' => 'nl, Dutch, nl_NL, nl_NL.utf8', + 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%e %B %Y', 'date_time' => '%e %B %Y, @ %T', From eba9c4e039cde945f1304c81fe0f00658fd2767c Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Feb 2017 13:11:12 +0100 Subject: [PATCH 052/276] New translations --- resources/lang/pl_PL/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pl_PL/config.php b/resources/lang/pl_PL/config.php index 29dfe740f4..25042c927a 100644 --- a/resources/lang/pl_PL/config.php +++ b/resources/lang/pl_PL/config.php @@ -10,7 +10,7 @@ */ return [ - 'locale' => 'pl, Polski, pl_PL, pl_PL.utf8', + 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%e %B %Y', 'date_time' => '%B %e, %Y, @ %T', From 07ebe7183954acd51c4f6f474e046776a508ea54 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Feb 2017 13:11:23 +0100 Subject: [PATCH 053/276] New translations --- resources/lang/pt_BR/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/config.php b/resources/lang/pt_BR/config.php index 1800829bde..29128d2afd 100644 --- a/resources/lang/pt_BR/config.php +++ b/resources/lang/pt_BR/config.php @@ -10,7 +10,7 @@ */ return [ - 'locale' => 'pt_BR, pt_BR.utf8', + 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%e de %B de %Y', 'date_time' => '%B %e, %Y, @ %T', From da113035395de7835fb83ca94ea10fe84c7c721d Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Feb 2017 13:11:25 +0100 Subject: [PATCH 054/276] New translations --- resources/lang/ru_RU/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/ru_RU/config.php b/resources/lang/ru_RU/config.php index 5544349117..76e8eb7d88 100644 --- a/resources/lang/ru_RU/config.php +++ b/resources/lang/ru_RU/config.php @@ -10,7 +10,7 @@ */ return [ - 'locale' => 'ru, Russian, ru_RU, ru_RU.utf8', + 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%B %e, %Y', 'date_time' => '%B %e, %Y, @ %T', From f6a25db17c8afbb154ba045ff84e1a7d3e2c569a Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Feb 2017 13:11:26 +0100 Subject: [PATCH 055/276] New translations --- resources/lang/de_DE/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/de_DE/config.php b/resources/lang/de_DE/config.php index 783fe0a459..ef642a7e8b 100644 --- a/resources/lang/de_DE/config.php +++ b/resources/lang/de_DE/config.php @@ -10,7 +10,7 @@ */ return [ - 'locale' => 'de, Deutsch, de_DE.utf8', + 'locale' => 'de, Deutsch, de_DE, de_DE.utf8, de_DE.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%e. %B %Y', 'date_time' => '%e %B %Y, @ %T', From 302fc876d9e9f6e5863562c401c71722d7c218a9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Feb 2017 13:11:28 +0100 Subject: [PATCH 056/276] Translated --- resources/lang/nl_NL/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/nl_NL/config.php b/resources/lang/nl_NL/config.php index 3b2420384f..608b288833 100644 --- a/resources/lang/nl_NL/config.php +++ b/resources/lang/nl_NL/config.php @@ -10,7 +10,7 @@ */ return [ - 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', + 'locale' => 'nl, Dutch, nl_NL, nl_NL.utf8, nl_NL.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%e %B %Y', 'date_time' => '%e %B %Y, @ %T', From d45a12e544a72544b19b042d1e95af697efb8901 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Feb 2017 13:11:44 +0100 Subject: [PATCH 057/276] New translations --- resources/lang/es_ES/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/es_ES/config.php b/resources/lang/es_ES/config.php index 58220429bf..827ebea3f0 100644 --- a/resources/lang/es_ES/config.php +++ b/resources/lang/es_ES/config.php @@ -10,7 +10,7 @@ */ return [ - 'locale' => 'en, English, en_US, en_US.utf8', + 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%B %e, %Y', 'date_time' => '%B %e, %Y, @ %T', From 899d4fe611eb832a1d30234e2c729b389ef72e26 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Feb 2017 13:12:04 +0100 Subject: [PATCH 058/276] New translations --- resources/lang/hr_HR/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/hr_HR/config.php b/resources/lang/hr_HR/config.php index 1c11063285..61ed65512d 100644 --- a/resources/lang/hr_HR/config.php +++ b/resources/lang/hr_HR/config.php @@ -10,7 +10,7 @@ */ return [ - 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', + 'locale' => 'hr, Croatian, hr_HR, hr_HR.utf8, hr_HR.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%e %B %Y', 'date_time' => '%e %B %Y, @ %T', From 5105c942335be961c41cd5a92be1234719996475 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Feb 2017 13:12:31 +0100 Subject: [PATCH 059/276] New translations --- resources/lang/fr_FR/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/config.php b/resources/lang/fr_FR/config.php index f44be30df9..c5214455e4 100644 --- a/resources/lang/fr_FR/config.php +++ b/resources/lang/fr_FR/config.php @@ -10,7 +10,7 @@ */ return [ - 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', + 'locale' => 'fr, French, fr_FR, fr_FR.utf8, fr_FR.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%e %B %Y', 'date_time' => '%B %e %Y @ %T', From 915afa4534612cca9c33368b5691020ed38c59bd Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Feb 2017 13:20:47 +0100 Subject: [PATCH 060/276] Translated --- resources/lang/pt_BR/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/config.php b/resources/lang/pt_BR/config.php index 29128d2afd..297140c4ca 100644 --- a/resources/lang/pt_BR/config.php +++ b/resources/lang/pt_BR/config.php @@ -10,7 +10,7 @@ */ return [ - 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', + 'locale' => 'pt-br, pt_BR, pt_BR.utf8, pt_BR.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%e de %B de %Y', 'date_time' => '%B %e, %Y, @ %T', From d9611bd84fe2fe60607981cd341899cb0d39d4dc Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Feb 2017 13:20:51 +0100 Subject: [PATCH 061/276] New translations --- resources/lang/pl_PL/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pl_PL/config.php b/resources/lang/pl_PL/config.php index 25042c927a..3ccba5874d 100644 --- a/resources/lang/pl_PL/config.php +++ b/resources/lang/pl_PL/config.php @@ -10,7 +10,7 @@ */ return [ - 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', + 'locale' => 'pl, Polish, polski, pl_PL, pl_PL.utf8, pl_PL.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%e %B %Y', 'date_time' => '%B %e, %Y, @ %T', From 9bb8a9ccd1e43c3cb9599a6c9889ba1675fef50b Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Feb 2017 13:20:54 +0100 Subject: [PATCH 062/276] New translations --- resources/lang/es_ES/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/es_ES/config.php b/resources/lang/es_ES/config.php index 827ebea3f0..223b3f8bd3 100644 --- a/resources/lang/es_ES/config.php +++ b/resources/lang/es_ES/config.php @@ -10,7 +10,7 @@ */ return [ - 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', + 'locale' => 'es, Spanish, es_ES, es_ES.utf8, es_ES.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%B %e, %Y', 'date_time' => '%B %e, %Y, @ %T', From 96e0d4e29f920054c37470b944ac3ff1e32e3d5d Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 6 Feb 2017 13:20:57 +0100 Subject: [PATCH 063/276] Translated --- resources/lang/ru_RU/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/ru_RU/config.php b/resources/lang/ru_RU/config.php index 76e8eb7d88..4e7ce17f0f 100644 --- a/resources/lang/ru_RU/config.php +++ b/resources/lang/ru_RU/config.php @@ -10,7 +10,7 @@ */ return [ - 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', + 'locale' => 'ru, Russian, ru_RU, ru_RU.utf8, ru_RU.UTF-8', 'month' => '%B %Y', 'month_and_day' => '%B %e, %Y', 'date_time' => '%B %e, %Y, @ %T', From 1285a88660b2d000710d6a060c38e186bd4c460a Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 8 Feb 2017 22:07:47 +0100 Subject: [PATCH 064/276] Different value for title field [skip ci] --- resources/views/list/piggy-banks.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/list/piggy-banks.twig b/resources/views/list/piggy-banks.twig index c754498b8f..2d6556f483 100644 --- a/resources/views/list/piggy-banks.twig +++ b/resources/views/list/piggy-banks.twig @@ -32,7 +32,7 @@ - {{ piggyBank.name }} + {{ piggyBank.name }} {{ piggyBank.savedSoFar|formatAmount }} From 3914796e4eef6ad54f7375064c5b4fd7b9bd98bb Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Feb 2017 17:21:44 +0100 Subject: [PATCH 065/276] Experimental new transfer filter. --- app/Helpers/Collector/JournalCollector.php | 42 +++++++--------------- 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php index 6e2d7a0d8e..1d6a042cb3 100644 --- a/app/Helpers/Collector/JournalCollector.php +++ b/app/Helpers/Collector/JournalCollector.php @@ -618,7 +618,7 @@ class JournalCollector implements JournalCollectorInterface * account, chances are the set include double entries: transfers get selected * on both the source, and then again on the destination account. * - * This method filters them out. + * This method filters them out by removing transfers that have been selected twice. * * @param Collection $set * @@ -627,36 +627,18 @@ class JournalCollector implements JournalCollectorInterface private function filterTransfers(Collection $set): Collection { if ($this->filterTransfers) { - $set = $set->filter( - function (Transaction $transaction) { - if (!($transaction->transaction_type_type === TransactionType::TRANSFER && bccomp($transaction->transaction_amount, '0') === -1)) { - - Log::debug( - sprintf( - 'Included journal #%d (transaction #%d) because its a %s with amount %f', - $transaction->transaction_journal_id, - $transaction->id, - $transaction->transaction_type_type, - $transaction->transaction_amount - ) - ); - - return $transaction; - } - - Log::debug( - sprintf( - 'Removed journal #%d (transaction #%d) because its a %s with amount %f', - $transaction->transaction_journal_id, - $transaction->id, - $transaction->transaction_type_type, - $transaction->transaction_amount - ) - ); - - return false; + $count = []; + $new = new Collection; + /** @var Transaction $transaction */ + foreach($set as $transaction) { + $journalId =$transaction->transaction_journal_id; + if(!isset($count[$journalId]) ) { + // not yet counted? add to new set and count it: + $new->push($transaction); + $count[$journalId] = 1; } - ); + } + return $new; } return $set; From 0cbed2d5d231b6a90c92b83b596ab0dafe142988 Mon Sep 17 00:00:00 2001 From: Christian Musa Date: Sat, 11 Feb 2017 00:33:20 -0300 Subject: [PATCH 066/276] Improve docker support - Add docker-compose file - Add environment variable to initialize the database - Add custom entrypoint that generates the .env file based on the environment variables - Update Dockerfile (gettext-base package) --- .env.docker | 55 ++++++++++++++++++++++++++++++++++++++++++++ Dockerfile | 3 +++ docker-compose.yml | 33 ++++++++++++++++++++++++++ docker/entrypoint.sh | 16 +++++++++++++ 4 files changed, 107 insertions(+) create mode 100644 .env.docker create mode 100644 docker-compose.yml create mode 100755 docker/entrypoint.sh diff --git a/.env.docker b/.env.docker new file mode 100644 index 0000000000..69765bff51 --- /dev/null +++ b/.env.docker @@ -0,0 +1,55 @@ +APP_ENV=${FF_APP_ENV} +APP_DEBUG=false +APP_FORCE_SSL=false +APP_FORCE_ROOT= +APP_KEY=${FF_APP_KEY} +APP_LOG=daily +APP_LOG_LEVEL=warning +APP_URL=http://localhost + +DB_CONNECTION=mysql +DB_HOST=${FF_DB_HOST} +DB_PORT=3306 +DB_DATABASE=${FF_DB_NAME} +DB_USERNAME=${FF_DB_USER} +DB_PASSWORD=${FF_DB_PASSWORD} + +BROADCAST_DRIVER=log +CACHE_DRIVER=file +SESSION_DRIVER=file +QUEUE_DRIVER=sync + +COOKIE_PATH="/" +COOKIE_DOMAIN= +COOKIE_SECURE=false + +REDIS_HOST=127.0.0.1 +REDIS_PASSWORD=null +REDIS_PORT=6379 + +MAIL_DRIVER=smtp +MAIL_HOST=mailtrap.io +MAIL_PORT=2525 +MAIL_FROM=changeme@example.com +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null + +SEND_REGISTRATION_MAIL=true +SEND_ERROR_MESSAGE=true +SHOW_INCOMPLETE_TRANSLATIONS=false + +CACHE_PREFIX=firefly + +GOOGLE_MAPS_API_KEY= +ANALYTICS_ID= +SITE_OWNER=mail@example.com +USE_ENCRYPTION=true + +PUSHER_KEY= +PUSHER_SECRET= +PUSHER_APP_ID= + +DEMO_USERNAME= +DEMO_PASSWORD= + diff --git a/Dockerfile b/Dockerfile index 2311881871..7d00a3724b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ RUN apt-get update -y && \ libxml2-dev \ libsqlite3-dev \ libbz2-dev \ + gettext-base \ locales && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* @@ -44,3 +45,5 @@ WORKDIR /var/www/firefly-iii RUN composer install --no-scripts --no-dev USER root + +ENTRYPOINT ["/var/www/firefly-iii/docker/entrypoint.sh"] diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000000..cdf765d487 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,33 @@ +version: '2' + +services: + firefly-db: + image: mysql:8 + environment: + - MYSQL_DATABASE=firefly_db + - MYSQL_USER=firefly_db + - MYSQL_PASSWORD=firefly_db_secret + - MYSQL_RANDOM_ROOT_PASSWORD=yes + volumes: + - firefly-storage:/var/lib/mysql + + firefly-app: + image: firefly-iii + build: + context: . + environment: + - INIT_DATABASE=yes + - FF_DB_HOST=firefly-db + - FF_DB_NAME=firefly_db + - FF_DB_USER=firefly_db + - FF_DB_PASSWORD=firefly_db_secret + - FF_APP_KEY=SomeRandomStringOf32CharsExactly + - FF_APP_ENV=development + ports: + - "80:80" + links: + - firefly-db + +volumes: + firefly-storage: + driver: local \ No newline at end of file diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh new file mode 100755 index 0000000000..2ae2404c2c --- /dev/null +++ b/docker/entrypoint.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +cat .env.docker | envsubst > .env + +if [ "${INIT_DATABASE:="no"}" = "yes" ]; then + echo "Init database detected, checking mysql status" + # depends on your machine, but it may take a file to boot mysql container the first time + until php artisan firefly:verify &>/dev/null + do + echo "waiting mysql" + sleep 10 + done + php artisan migrate:refresh --seed +fi + +exec apache2-foreground \ No newline at end of file From aa2d78f36ab288472b3f844520c26f16451fe144 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Feb 2017 09:34:04 +0100 Subject: [PATCH 067/276] Expand filter --- app/Helpers/Collector/JournalCollector.php | 24 ++++++++++++++++------ app/Support/Steam.php | 19 ++++++++++++++--- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php index 1d6a042cb3..f1de985b9e 100644 --- a/app/Helpers/Collector/JournalCollector.php +++ b/app/Helpers/Collector/JournalCollector.php @@ -32,6 +32,7 @@ use Illuminate\Database\Query\JoinClause; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; use Log; +use Steam; /** * Maybe this is a good idea after all... @@ -235,7 +236,7 @@ class JournalCollector implements JournalCollectorInterface /** @var AccountRepositoryInterface $repository */ $repository = app(AccountRepositoryInterface::class); $repository->setUser($this->user); - $accounts = $repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT]); + $accounts = $repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT]); if ($accounts->count() > 0) { $accountIds = $accounts->pluck('id')->toArray(); $this->query->whereIn('transactions.account_id', $accountIds); @@ -628,16 +629,27 @@ class JournalCollector implements JournalCollectorInterface { if ($this->filterTransfers) { $count = []; - $new = new Collection; + $new = new Collection; /** @var Transaction $transaction */ - foreach($set as $transaction) { - $journalId =$transaction->transaction_journal_id; - if(!isset($count[$journalId]) ) { + foreach ($set as $transaction) { + if ($transaction->transaction_type_type !== TransactionType::TRANSFER) { + $new->push($transaction); + continue; + } + // make property string: + $journalId = $transaction->transaction_journal_id; + $amount = Steam::positive($transaction->transaction_amount); + $source = $transaction->account_id; + $dest = $transaction->opposing_account_id; + $key = $journalId . $source . $dest . $amount; + + if (!isset($count[$key])) { // not yet counted? add to new set and count it: $new->push($transaction); - $count[$journalId] = 1; + $count[$key] = 1; } } + return $new; } diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 0185a93caf..669c2e468b 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -26,7 +26,6 @@ use FireflyIII\Models\Transaction; class Steam { - /** * * @param \FireflyIII\Models\Account $account @@ -202,8 +201,6 @@ class Steam return $list; } - // parse PHP size: - /** * @param $string * @@ -239,4 +236,20 @@ class Steam } + // parse PHP size: + + /** + * @param string $amount + * + * @return string + */ + public function positive(string $amount): string + { + if (bccomp($amount, '0') === 1) { + $amount = bcmul($amount, '-1'); + } + + return $amount; + } + } From 5e47492318624a4388861c8f305a1f04575a5977 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Feb 2017 10:05:58 +0100 Subject: [PATCH 068/276] Clean up budget report partial --- app/Helpers/Collection/Budget.php | 193 ------------------ app/Helpers/Collection/BudgetLine.php | 161 --------------- app/Helpers/Report/BudgetReportHelper.php | 63 +++--- .../Report/BudgetReportHelperInterface.php | 5 +- resources/views/reports/partials/budgets.twig | 96 ++++----- 5 files changed, 78 insertions(+), 440 deletions(-) delete mode 100644 app/Helpers/Collection/Budget.php delete mode 100644 app/Helpers/Collection/BudgetLine.php diff --git a/app/Helpers/Collection/Budget.php b/app/Helpers/Collection/Budget.php deleted file mode 100644 index f590cb6216..0000000000 --- a/app/Helpers/Collection/Budget.php +++ /dev/null @@ -1,193 +0,0 @@ -budgetLines = new Collection; - } - - /** - * @param BudgetLine $budgetLine - * - * @return Budget - */ - public function addBudgetLine(BudgetLine $budgetLine): Budget - { - $this->budgetLines->push($budgetLine); - - return $this; - } - - /** - * @param string $add - * - * @return Budget - */ - public function addBudgeted(string $add): Budget - { - $this->budgeted = bcadd($this->budgeted, $add); - - return $this; - } - - /** - * @param string $add - * - * @return Budget - */ - public function addLeft(string $add): Budget - { - $this->left = bcadd($this->left, $add); - - return $this; - } - - /** - * @param string $add - * - * @return Budget - */ - public function addOverspent(string $add): Budget - { - $this->overspent = bcadd($this->overspent, $add); - - return $this; - } - - /** - * @param string $add - * - * @return Budget - */ - public function addSpent(string $add): Budget - { - $this->spent = bcadd($this->spent, $add); - - return $this; - } - - /** - * @return \Illuminate\Support\Collection - */ - public function getBudgetLines(): Collection - { - return $this->budgetLines; - } - - /** - * @return string - */ - public function getBudgeted(): string - { - return $this->budgeted; - } - - /** - * @param string $budgeted - * - * @return Budget - */ - public function setBudgeted(string $budgeted): Budget - { - $this->budgeted = $budgeted; - - return $this; - } - - /** - * @return string - */ - public function getLeft(): string - { - return $this->left; - } - - /** - * @param string $left - * - * @return Budget - */ - public function setLeft(string $left): Budget - { - $this->left = $left; - - return $this; - } - - /** - * @return string - */ - public function getOverspent(): string - { - return $this->overspent; - } - - /** - * @param string $overspent - * - * @return Budget - */ - public function setOverspent(string $overspent): Budget - { - $this->overspent = $overspent; - - return $this; - } - - /** - * @return string - */ - public function getSpent(): string - { - return $this->spent; - } - - /** - * @param string $spent - * - * @return Budget - */ - public function setSpent(string $spent): Budget - { - $this->spent = $spent; - - return $this; - } - - -} diff --git a/app/Helpers/Collection/BudgetLine.php b/app/Helpers/Collection/BudgetLine.php deleted file mode 100644 index 03bf59f8ff..0000000000 --- a/app/Helpers/Collection/BudgetLine.php +++ /dev/null @@ -1,161 +0,0 @@ -budget ?? new BudgetModel; - } - - /** - * @param BudgetModel $budget - * - * @return BudgetLine - */ - public function setBudget(BudgetModel $budget): BudgetLine - { - $this->budget = $budget; - - return $this; - } - - /** - * @return BudgetLimit - */ - public function getBudgetLimit(): BudgetLimit - { - return $this->budgetLimit ?? new BudgetLimit; - } - - /** - * @param BudgetLimit $budgetLimit - * - * @return BudgetLimit - */ - public function setBudgetLimit(BudgetLimit $budgetLimit): BudgetLine - { - $this->budgetLimit = $budgetLimit; - - return $this; - } - - /** - * @return string - */ - public function getBudgeted(): string - { - return $this->budgeted; - } - - /** - * @param string $budgeted - * - * @return BudgetLine - */ - public function setBudgeted(string $budgeted): BudgetLine - { - $this->budgeted = $budgeted; - - return $this; - } - - /** - * @return string - */ - public function getLeft(): string - { - return $this->left; - } - - /** - * @param string $left - * - * @return BudgetLine - */ - public function setLeft(string $left): BudgetLine - { - $this->left = $left; - - return $this; - } - - /** - * @return string - */ - public function getOverspent(): string - { - return $this->overspent; - } - - /** - * @param string $overspent - * - * @return BudgetLine - */ - public function setOverspent(string $overspent): BudgetLine - { - $this->overspent = $overspent; - - return $this; - } - - /** - * @return string - */ - public function getSpent(): string - { - return $this->spent; - } - - /** - * @param string $spent - * - * @return BudgetLine - */ - public function setSpent(string $spent): BudgetLine - { - $this->spent = $spent; - - return $this; - } - - -} diff --git a/app/Helpers/Report/BudgetReportHelper.php b/app/Helpers/Report/BudgetReportHelper.php index dff9d99d74..8025b0a159 100644 --- a/app/Helpers/Report/BudgetReportHelper.php +++ b/app/Helpers/Report/BudgetReportHelper.php @@ -15,8 +15,6 @@ namespace FireflyIII\Helpers\Report; use Carbon\Carbon; -use FireflyIII\Helpers\Collection\Budget as BudgetCollection; -use FireflyIII\Helpers\Collection\BudgetLine; use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; @@ -48,44 +46,63 @@ class BudgetReportHelper implements BudgetReportHelperInterface * @param Carbon $end * @param Collection $accounts * - * @return BudgetCollection + * @return array */ - public function getBudgetReport(Carbon $start, Carbon $end, Collection $accounts): BudgetCollection + public function getBudgetReport(Carbon $start, Carbon $end, Collection $accounts): array { - $object = new BudgetCollection; - $set = $this->repository->getBudgets(); + $set = $this->repository->getBudgets(); + $array = []; /** @var Budget $budget */ foreach ($set as $budget) { $budgetLimits = $this->repository->getBudgetLimits($budget, $start, $end); if ($budgetLimits->count() == 0) { // no budget limit(s) for this budget + $spent = $this->repository->spentInPeriod(new Collection([$budget]), $accounts, $start, $end);// spent for budget in time range - if ($spent > 0) { - $budgetLine = new BudgetLine; - $budgetLine->setBudget($budget)->setOverspent($spent); - $object->addOverspent($spent)->addBudgetLine($budgetLine); + if (bccomp($spent, '0') === -1) { + $line = [ + 'type' => 'budget', + 'id' => $budget->id, + 'name' => $budget->name, + 'budgeted' => '0', + 'spent' => $spent, + 'left' => '0', + 'overspent' => '0', + ]; + $array[] = $line; } continue; } /** @var BudgetLimit $budgetLimit */ foreach ($budgetLimits as $budgetLimit) { // one or more repetitions for budget - $data = $this->calculateExpenses($budget, $budgetLimit, $accounts); - $budgetLine = new BudgetLine; - $budgetLine->setBudget($budget)->setBudgetLimit($budgetLimit) - ->setLeft($data['left'])->setSpent($data['expenses'])->setOverspent($data['overspent']) - ->setBudgeted(strval($budgetLimit->amount)); - - $object->addBudgeted(strval($budgetLimit->amount))->addSpent($data['spent']) - ->addLeft($data['left'])->addOverspent($data['overspent'])->addBudgetLine($budgetLine); + $data = $this->calculateExpenses($budget, $budgetLimit, $accounts); + $line = [ + 'type' => 'budget-line', + 'start' => $budgetLimit->start_date, + 'end' => $budgetLimit->end_date, + 'limit' => $budgetLimit->id, + 'id' => $budget->id, + 'name' => $budget->name, + 'budgeted' => strval($budgetLimit->amount), + 'spent' => $data['expenses'], + 'left' => $data['left'], + 'overspent' => $data['overspent'], + ]; + $array[] = $line; } } - $noBudget = $this->repository->spentInPeriodWoBudget($accounts, $start, $end); // stuff outside of budgets - $budgetLine = new BudgetLine; - $budgetLine->setOverspent($noBudget)->setSpent($noBudget); - $object->addOverspent($noBudget)->addBudgetLine($budgetLine); + $noBudget = $this->repository->spentInPeriodWoBudget($accounts, $start, $end); // stuff outside of budgets + $line = [ + 'type' => 'no-budget', + 'budgeted' => '0', + 'spent' => $noBudget, + 'left' => '0', + 'overspent' => '0', + ]; + $array[] = $line; - return $object; + return $array; } /** diff --git a/app/Helpers/Report/BudgetReportHelperInterface.php b/app/Helpers/Report/BudgetReportHelperInterface.php index 07234f9694..a64d47d39f 100644 --- a/app/Helpers/Report/BudgetReportHelperInterface.php +++ b/app/Helpers/Report/BudgetReportHelperInterface.php @@ -15,7 +15,6 @@ namespace FireflyIII\Helpers\Report; use Carbon\Carbon; -use FireflyIII\Helpers\Collection\Budget as BudgetCollection; use Illuminate\Support\Collection; /** @@ -31,9 +30,9 @@ interface BudgetReportHelperInterface * @param Carbon $end * @param Collection $accounts * - * @return BudgetCollection + * @return array */ - public function getBudgetReport(Carbon $start, Carbon $end, Collection $accounts): BudgetCollection; + public function getBudgetReport(Carbon $start, Carbon $end, Collection $accounts): array; /** * @param Carbon $start diff --git a/resources/views/reports/partials/budgets.twig b/resources/views/reports/partials/budgets.twig index be4b938c4b..97fef8c762 100644 --- a/resources/views/reports/partials/budgets.twig +++ b/resources/views/reports/partials/budgets.twig @@ -11,26 +11,33 @@ - {% for budgetLine in budgets.getBudgetLines %} - + {% set sum_budgeted = 0 %} + {% set sum_spent = 0 %} + {% set sum_left = 0 %} + {% set sum_overspent = 0 %} + {% for line in budgets %} - {% if budgetLine.getBudget.id %} - - {{ budgetLine.getBudget.name }} - - {% else %} + {% set sum_budgeted = sum_budgeted + line.budgeted %} + {% set sum_spent = sum_spent + line.spent %} + {% set sum_left = sum_left + line.left %} + {% set sum_overspent = sum_overspent + line.overspent %} + + + {% if line.type == 'no-budget' %} {{ 'no_budget'|_ }} + {% else %} + + {{ line.name }} + {% endif %} - - - {% if budgetLine.getBudgetLimit.id %} - - - {{ budgetLine.getBudgetLimit.start_date.formatLocalized(monthAndDayFormat) }} + {% if line.type == 'budget-line' %} + + + {{ line.start.formatLocalized(monthAndDayFormat) }} — - {{ budgetLine.getBudgetLimit.end_date.formatLocalized(monthAndDayFormat) }} + {{ line.end.formatLocalized(monthAndDayFormat) }} {% else %} @@ -38,47 +45,23 @@ {% endif %} - - - {% if budgetLine.getBudgetLimit.id %} - - {{ budgetLine.getBudgetLimit.amount|formatAmount }} - - {% else %} - - {{ 0|formatAmount }} - - {% endif %} - - - {% if budgetLine.getSpent != 0 %} - {{ budgetLine.getSpent|formatAmount }} - - {% endif %} - - {% if budgetLine.getSpent == 0 %} - {{ budgetLine.getSpent|formatAmount }} - {% endif %} + + {{ line.budgeted|formatAmount }} + + + {{ line.spent|formatAmount }} - {% if budgetLine.getSpent != 0 %} + {% if line.spent != 0 %} - + data-location="budget-spent-amount" data-budget-id="{{ line.id }}"> {% endif %} - - - {% if(budgetLine.getOverspent == 0) %} - {{ budgetLine.getLeft|formatAmount }} - {% endif %} + + {{ line.left|formatAmount }} - - {% if budgetLine.getOverspent != 0 %} - {{ budgetLine.getOverspent|formatAmount }} - {% endif %} + + {{ line.overspent|formatAmount }} {% endfor %} @@ -87,18 +70,11 @@ {{ 'sum'|_ }}   - {{ budgets.getBudgeted|formatAmount }} - - {% if budgets.getSpent != 0 %} - {{ budgets.getSpent|formatAmountPlain }} - {% endif %} - {% if budgets.getSpent == 0 %} - {{ budgets.getSpent|formatAmount }} - {% endif %} - + {{ sum_budgeted|formatAmount }} + {{ sum_spent|formatAmount }}   - {{ budgets.getLeft|formatAmount }} - {{ budgets.getOverspent|formatAmountPlain }} + {{ sum_left|formatAmount }} + {{ sum_overspent|formatAmount }} From 8e89899070eb9febaaf131037a0bd43f5229a906 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Feb 2017 10:11:57 +0100 Subject: [PATCH 069/276] Add EOF --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index cdf765d487..a7c42b18a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,4 +30,4 @@ services: volumes: firefly-storage: - driver: local \ No newline at end of file + driver: local From 0be3dd4fe441366176b2f22dcdb18d99db044e07 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Feb 2017 10:12:11 +0100 Subject: [PATCH 070/276] Add EOF --- docker/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 2ae2404c2c..0baf22e862 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -13,4 +13,4 @@ if [ "${INIT_DATABASE:="no"}" = "yes" ]; then php artisan migrate:refresh --seed fi -exec apache2-foreground \ No newline at end of file +exec apache2-foreground From 4c2d9e0eee756f699a512bfa496cdd301fa1ec91 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Feb 2017 15:52:55 +0100 Subject: [PATCH 071/276] Small code cleanup. --- .github/CONTRIBUTING.md | 2 +- app/Generator/Chart/Basic/ChartJsGenerator.php | 7 ++----- app/Helpers/Chart/MetaPieChart.php | 6 ++---- app/Import/ImportStorage.php | 18 ++---------------- app/Rules/Triggers/AmountExactly.php | 2 +- app/Rules/Triggers/AmountLess.php | 2 +- app/Rules/Triggers/AmountMore.php | 2 +- app/Support/Steam.php | 2 +- 8 files changed, 11 insertions(+), 30 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 3ebecdd310..612661a00f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -16,4 +16,4 @@ Take the time to read the [installation guide FAQ](https://firefly-iii.github.io ## Pull requests -I can only accept pull requests against the `develop` branch, never the `master` branch +I can only accept pull requests against the `develop` branch, never the `master` branch. diff --git a/app/Generator/Chart/Basic/ChartJsGenerator.php b/app/Generator/Chart/Basic/ChartJsGenerator.php index 85cff4d4f6..b7588d2da2 100644 --- a/app/Generator/Chart/Basic/ChartJsGenerator.php +++ b/app/Generator/Chart/Basic/ChartJsGenerator.php @@ -14,6 +14,7 @@ declare(strict_types = 1); namespace FireflyIII\Generator\Chart\Basic; use FireflyIII\Support\ChartColour; +use Steam; /** * Class ChartJsGenerator @@ -108,11 +109,7 @@ class ChartJsGenerator implements GeneratorInterface foreach ($data as $key => $value) { // make larger than 0 - if (bccomp($value, '0') === -1) { - $value = bcmul($value, '-1'); - } - - $chartData['datasets'][0]['data'][] = $value; + $chartData['datasets'][0]['data'][] = floatval(Steam::positive($value)); $chartData['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index); $chartData['labels'][] = $key; $index++; diff --git a/app/Helpers/Chart/MetaPieChart.php b/app/Helpers/Chart/MetaPieChart.php index 4290720405..c2a87fbe95 100644 --- a/app/Helpers/Chart/MetaPieChart.php +++ b/app/Helpers/Chart/MetaPieChart.php @@ -21,6 +21,7 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\User; use Illuminate\Support\Collection; +use Steam; /** * Class MetaPieChart @@ -268,10 +269,7 @@ class MetaPieChart implements MetaPieChartInterface $object = $repository->find(intval($objectId)); $names[$objectId] = $object->name; } - if (bccomp($amount, '0') === -1) { - $amount = bcmul($amount, '-1'); - } - + $amount = Steam::positive($amount); $this->total = bcadd($this->total, $amount); $chartData[$names[$objectId]] = $amount; } diff --git a/app/Import/ImportStorage.php b/app/Import/ImportStorage.php index 12b5e33a6c..ec68385e0d 100644 --- a/app/Import/ImportStorage.php +++ b/app/Import/ImportStorage.php @@ -27,6 +27,7 @@ use FireflyIII\Rules\Processor; use FireflyIII\User; use Illuminate\Support\Collection; use Log; +use Steam; /** * Class ImportStorage @@ -197,21 +198,6 @@ class ImportStorage } - /** - * @param float $amount - * - * @return string - */ - private function makePositive(float $amount): string - { - $amount = strval($amount); - if (bccomp($amount, '0', 4) === -1) { // left is larger than right - $amount = bcmul($amount, '-1'); - } - - return $amount; - } - /** * @param $entry * @@ -370,7 +356,7 @@ class ImportStorage $journal = $this->storeJournal($entry); - $amount = $this->makePositive($entry->fields['amount']); + $amount = Steam::positive($entry->fields['amount']); $accounts = $this->storeAccounts($entry); // create new transactions. This is something that needs a rewrite for multiple/split transactions. diff --git a/app/Rules/Triggers/AmountExactly.php b/app/Rules/Triggers/AmountExactly.php index cef4d8315d..e7984deb02 100644 --- a/app/Rules/Triggers/AmountExactly.php +++ b/app/Rules/Triggers/AmountExactly.php @@ -60,7 +60,7 @@ final class AmountExactly extends AbstractTrigger implements TriggerInterface { $amount = $journal->destination_amount ?? TransactionJournal::amountPositive($journal); $compare = $this->triggerValue; - $result = bccomp($amount, $compare, 4); + $result = bccomp($amount, $compare); if ($result === 0) { Log::debug(sprintf('RuleTrigger AmountExactly for journal #%d: %d matches %d exactly, so return true', $journal->id, $amount, $compare)); diff --git a/app/Rules/Triggers/AmountLess.php b/app/Rules/Triggers/AmountLess.php index cbf4e61ac3..1c856c6796 100644 --- a/app/Rules/Triggers/AmountLess.php +++ b/app/Rules/Triggers/AmountLess.php @@ -60,7 +60,7 @@ final class AmountLess extends AbstractTrigger implements TriggerInterface { $amount = $journal->destination_amount ?? TransactionJournal::amountPositive($journal); $compare = $this->triggerValue; - $result = bccomp($amount, $compare, 4); + $result = bccomp($amount, $compare); if ($result === -1) { Log::debug(sprintf('RuleTrigger AmountLess for journal #%d: %d is less than %d, so return true', $journal->id, $amount, $compare)); diff --git a/app/Rules/Triggers/AmountMore.php b/app/Rules/Triggers/AmountMore.php index d44cca0071..d8a7ce1643 100644 --- a/app/Rules/Triggers/AmountMore.php +++ b/app/Rules/Triggers/AmountMore.php @@ -66,7 +66,7 @@ final class AmountMore extends AbstractTrigger implements TriggerInterface { $amount = $journal->destination_amount ?? TransactionJournal::amountPositive($journal); $compare = $this->triggerValue; - $result = bccomp($amount, $compare, 4); + $result = bccomp($amount, $compare); if ($result === 1) { Log::debug(sprintf('RuleTrigger AmountMore for journal #%d: %d is more than %d, so return true', $journal->id, $amount, $compare)); diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 669c2e468b..870b55566c 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -245,7 +245,7 @@ class Steam */ public function positive(string $amount): string { - if (bccomp($amount, '0') === 1) { + if (bccomp($amount, '0') === -1) { $amount = bcmul($amount, '-1'); } From b5a005dcc57d44b31fde40c7f467c44157ddfc75 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Feb 2017 16:32:03 +0100 Subject: [PATCH 072/276] Better 404 page [skip ci] --- resources/views/errors/404.twig | 287 +++++--------------------------- 1 file changed, 40 insertions(+), 247 deletions(-) diff --git a/resources/views/errors/404.twig b/resources/views/errors/404.twig index 41481b8501..d68a915eb6 100644 --- a/resources/views/errors/404.twig +++ b/resources/views/errors/404.twig @@ -1,254 +1,47 @@ - - - + + + 404 + + + + + + + + {% include('partials.favicons') %} - -
                                                                                                                                                                                              -

                                                                                                                                                                                              Sorry, the page you are looking for could not be found.

                                                                                                                                                                                              + +
                                                                                                                                                                                              + +
                                                                                                                                                                                              +
                                                                                                                                                                                              +

                                                                                                                                                                                              404 — Firefly III cannot find this page.

                                                                                                                                                                                              +
                                                                                                                                                                                              +
                                                                                                                                                                                              + +
                                                                                                                                                                                              +
                                                                                                                                                                                              +

                                                                                                                                                                                              + The page you have requested does not exist. Please check that you have not entered + the wrong URL. Did you make a typo perhaps? +

                                                                                                                                                                                              +
                                                                                                                                                                                              +
                                                                                                                                                                                              +
                                                                                                                                                                                              +
                                                                                                                                                                                              +

                                                                                                                                                                                              + If you are sure this page should exist, please open a ticket on + Github. +

                                                                                                                                                                                              +
                                                                                                                                                                                              +
                                                                                                                                                                                              + - + \ No newline at end of file From dcc2b9c1cbe9709dc99fc52791c84144af9ff8b0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Feb 2017 18:35:16 +0100 Subject: [PATCH 073/276] This fixes #559 --- app/Http/Requests/AccountFormRequest.php | 4 ++-- resources/views/accounts/create.twig | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Requests/AccountFormRequest.php b/app/Http/Requests/AccountFormRequest.php index cbd07f46ee..cadf22b600 100644 --- a/app/Http/Requests/AccountFormRequest.php +++ b/app/Http/Requests/AccountFormRequest.php @@ -77,11 +77,11 @@ class AccountFormRequest extends Request return [ 'id' => $idRule, 'name' => $nameRule, - 'openingBalance' => 'numeric', + 'openingBalance' => 'numeric|required_with:openingBalanceDate', + 'openingBalanceDate' => 'date|required_with:openingBalance', 'iban' => 'iban', 'BIC' => 'bic', 'virtualBalance' => 'numeric', - 'openingBalanceDate' => 'date', 'currency_id' => 'exists:transaction_currencies,id', 'accountNumber' => 'between:1,255|uniqueAccountNumberForUser', 'accountRole' => 'in:' . $accountRoles, diff --git a/resources/views/accounts/create.twig b/resources/views/accounts/create.twig index 171ae13b1e..2063b86e79 100644 --- a/resources/views/accounts/create.twig +++ b/resources/views/accounts/create.twig @@ -40,7 +40,7 @@ {% if what == 'asset' %} {{ ExpandedForm.balance('openingBalance') }} - {{ ExpandedForm.date('openingBalanceDate', phpdate('Y-m-d')) }} + {{ ExpandedForm.date('openingBalanceDate') }} {{ ExpandedForm.select('accountRole', roles,null,{'helpText' : 'asset_account_role_help'|_}) }} {{ ExpandedForm.balance('virtualBalance') }} {% endif %} From 78074a5a5496253a209b250d28f299956171408c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 11 Feb 2017 18:38:38 +0100 Subject: [PATCH 074/276] Code for #553 --- app/Http/Controllers/AccountController.php | 1 - app/Http/Controllers/BillController.php | 1 - app/Http/Controllers/BudgetController.php | 3 --- app/Http/Controllers/CategoryController.php | 1 - app/Http/Controllers/TransactionController.php | 2 -- 5 files changed, 8 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 6ba0cc2248..66b2ff26a0 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -311,7 +311,6 @@ class AccountController extends Controller // replace with journal collector: /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->setLimit($pageSize)->setPage($page); $journals = $collector->getPaginatedJournals(); $journals->setPath('accounts/show/' . $account->id . '/' . $date); diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index c6aa3c0509..ae95ba23ef 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -209,7 +209,6 @@ class BillController extends Controller // use collector: /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAllAssetAccounts()->setBills(new Collection([$bill]))->setLimit($pageSize)->setPage($page)->withBudgetInformation() ->withCategoryInformation(); $journals = $collector->getPaginatedJournals(); diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index d85670dbfe..f21bc904fa 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -203,7 +203,6 @@ class BudgetController extends Controller // collector /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutBudget(); $journals = $collector->getPaginatedJournals(); $journals->setPath('/budgets/list/noBudget'); @@ -245,7 +244,6 @@ class BudgetController extends Controller // collector: /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAllAssetAccounts()->setRange($start, $end)->setBudget($budget)->setLimit($pageSize)->setPage($page)->withCategoryInformation(); $journals = $collector->getPaginatedJournals(); $journals->setPath('/budgets/show/' . $budget->id); @@ -283,7 +281,6 @@ class BudgetController extends Controller // collector: /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAllAssetAccounts()->setRange($budgetLimit->start_date, $budgetLimit->end_date) ->setBudget($budget)->setLimit($pageSize)->setPage($page)->withCategoryInformation(); $journals = $collector->getPaginatedJournals(); diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index ab8583af1a..2224cb3512 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -158,7 +158,6 @@ class CategoryController extends Controller // new collector: /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAllAssetAccounts()->setRange($start, $end)->withoutCategory();//->groupJournals(); $journals = $collector->getJournals(); $subTitle = trans( diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index ba38605b8f..3557144c94 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -73,7 +73,6 @@ class TransactionController extends Controller /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setTypes($types)->setLimit($pageSize)->setPage($page)->setAllAssetAccounts(); $collector->setRange($start, $end)->withBudgetInformation()->withCategoryInformation(); @@ -124,7 +123,6 @@ class TransactionController extends Controller $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setTypes($types)->setLimit($pageSize)->setPage($page)->setAllAssetAccounts()->withBudgetInformation()->withCategoryInformation(); // do not filter transfers if $what = transfer. From abf0fdcf35dd1a42f0ad2466ce0d0ab094a3378a Mon Sep 17 00:00:00 2001 From: Enrico Lamperti Date: Sat, 11 Feb 2017 17:38:04 -0300 Subject: [PATCH 075/276] Fix smooth curves in graphs --- public/js/ff/charts.defaults.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/js/ff/charts.defaults.js b/public/js/ff/charts.defaults.js index c670667dd1..24095df4da 100644 --- a/public/js/ff/charts.defaults.js +++ b/public/js/ff/charts.defaults.js @@ -11,6 +11,11 @@ /** global: accounting */ var defaultChartOptions = { + elements: { + line : { + cubicInterpolationMode: 'monotone' + } + }, scales: { xAxes: [ { From 1a204d31e76a6e5d87fe8d95aa77c1fdcdb006bc Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 10:58:37 +0100 Subject: [PATCH 076/276] Small fix for opening balance issues in reports. --- app/Repositories/Account/AccountTasker.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.php index d43902e094..e5c81eb211 100644 --- a/app/Repositories/Account/AccountTasker.php +++ b/app/Repositories/Account/AccountTasker.php @@ -126,13 +126,15 @@ class AccountTasker implements AccountTaskerInterface ]; // get first journal date: - $first = $repository->oldestJournal($account); + $first = $repository->oldestJournal($account); + Log::debug(sprintf('Date of first journal for %s is %s', $account->name, $first->date->format('Y-m-d'))); $entry['start_balance'] = $startSet[$account->id] ?? '0'; $entry['end_balance'] = $endSet[$account->id] ?? '0'; - if (!is_null($first->id) && $yesterday < $first->date && $end >= $first->date) { - // something about balance? + + // first journal exists, and is on start, then this is the actual opening balance: + if (!is_null($first->id) && $first->date->isSameDay($start)) { $entry['start_balance'] = $first->transactions()->where('account_id', $account->id)->first()->amount; - Log::debug(sprintf('Account was opened before %s, so opening balance is %f', $yesterday->format('Y-m-d'), $entry['start_balance'])); + Log::debug(sprintf('Account %s was opened on %s, so opening balance is %f', $account->name, $start->format('Y-m-d'), $entry['start_balance'])); } $return['start'] = bcadd($return['start'], $entry['start_balance']); $return['end'] = bcadd($return['end'], $entry['end_balance']); From 5528663727d80cd6f47e9e270ffeadf02c00460c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 11:25:17 +0100 Subject: [PATCH 077/276] Re-implemented basic account controller tests. --- phpunit.coverage.xml | 9 +- phpunit.xml | 9 +- .../Controllers/AccountControllerTest.php | 213 ++++++++++++++++++ tests/Feature/ExampleTest.php | 21 +- tests/TestCase.php | 77 ++++++- 5 files changed, 319 insertions(+), 10 deletions(-) create mode 100644 tests/Feature/Controllers/AccountControllerTest.php diff --git a/phpunit.coverage.xml b/phpunit.coverage.xml index 75e3afd143..d643a5d6ec 100755 --- a/phpunit.coverage.xml +++ b/phpunit.coverage.xml @@ -10,11 +10,12 @@ beStrictAboutOutputDuringTests="true" stopOnFailure="true"> - - ./tests/acceptance + + ./tests/Feature - - ./tests/unit + + + ./tests/Unit diff --git a/phpunit.xml b/phpunit.xml index c096c7a945..b0e315533c 100755 --- a/phpunit.xml +++ b/phpunit.xml @@ -10,11 +10,12 @@ beStrictAboutOutputDuringTests="true" stopOnFailure="true"> - - ./tests/acceptance + + ./tests/Feature - - ./tests/unit + + + ./tests/Unit diff --git a/tests/Feature/Controllers/AccountControllerTest.php b/tests/Feature/Controllers/AccountControllerTest.php new file mode 100644 index 0000000000..37c9b79740 --- /dev/null +++ b/tests/Feature/Controllers/AccountControllerTest.php @@ -0,0 +1,213 @@ +be($this->user()); + $response = $this->get(route('accounts.create', ['asset'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                '); + } + + /** + * @covers \FireflyIII\Http\Controllers\AccountController::delete + */ + public function testDelete() + { + $this->be($this->user()); + $response = $this->get(route('accounts.delete', [1])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                  '); + } + + /** + * @covers \FireflyIII\Http\Controllers\AccountController::destroy + */ + public function testDestroy() + { + $this->session(['accounts.delete.url' => 'http://localhost/accounts/show/1']); + + $repository = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('find')->withArgs([0])->once()->andReturn(new Account); + $repository->shouldReceive('destroy')->andReturn(true); + + $this->be($this->user()); + $response = $this->post(route('accounts.destroy', [1])); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\AccountController::edit + */ + public function testEdit() + { + $this->be($this->user()); + $response = $this->get(route('accounts.edit', [1])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                    '); + } + + /** + * @covers \FireflyIII\Http\Controllers\AccountController::index + * @covers \FireflyIII\Http\Controllers\AccountController::isInArray + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testIndex(string $range) + { + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('accounts.index', ['asset'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                      '); + } + + /** + * @covers \FireflyIII\Http\Controllers\AccountController::show + * @covers \FireflyIII\Http\Controllers\AccountController::periodEntries + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testShow(string $range) + { + $date = new Carbon; + $this->session(['start' => $date, 'end' => clone $date]); + + $tasker = $this->mock(AccountTaskerInterface::class); + $tasker->shouldReceive('amountOutInPeriod')->withAnyArgs()->andReturn('-1'); + $tasker->shouldReceive('amountInInPeriod')->withAnyArgs()->andReturn('1'); + + // mock repository: + $repository = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('oldestJournalDate')->andReturn(clone $date); + $repository->shouldReceive('getAccountsByType')->andReturn(new Collection); + + + $collector = $this->mock(JournalCollectorInterface::class); + $collector->shouldReceive('setAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('setLimit')->andReturnSelf(); + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('accounts.show', [1])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                        '); + } + + /** + * @covers \FireflyIII\Http\Controllers\AccountController::showAll + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testShowAll(string $range) + { + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('accounts.show.all', [1])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                          '); + } + + /** + * @covers \FireflyIII\Http\Controllers\AccountController::showByDate + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testShowByDate(string $range) + { + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('accounts.show.date', [1, '2016-01-01'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                            '); + } + + /** + * @covers \FireflyIII\Http\Controllers\AccountController::store + */ + public function testStore() + { + $this->session(['accounts.create.url' => 'http://localhost']); + $this->be($this->user()); + $data = [ + 'name' => 'new account ' . rand(1000, 9999), + 'what' => 'asset', + ]; + + $response = $this->post(route('accounts.store', ['asset']), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + + // list should have this new account. + $response = $this->get(route('accounts.index', ['asset'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                              '); + $response->assertSee($data['name']); + } + + /** + * @covers \FireflyIII\Http\Controllers\AccountController::update + */ + public function testUpdate() + { + $this->session(['accounts.edit.url' => 'http://localhost']); + $this->be($this->user()); + $data = [ + 'name' => 'updated account ' . rand(1000, 9999), + 'active' => 1, + 'what' => 'asset', + ]; + + $response = $this->post(route('accounts.update', [1]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + + // list should have this new account. + $response = $this->get(route('accounts.index', ['asset'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                '); + $response->assertSee($data['name']); + } +} \ No newline at end of file diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php index 486dc271a3..a8a339029f 100644 --- a/tests/Feature/ExampleTest.php +++ b/tests/Feature/ExampleTest.php @@ -1,4 +1,11 @@ get('/'); + $response = $this->get('/login'); $response->assertStatus(200); } + + /** + * A basic test example. + * + * @return void + */ + public function testAnotherBasicTest() + { + $response = $this->get('/'); + + $response->assertStatus(302); + } } diff --git a/tests/TestCase.php b/tests/TestCase.php index 51b7cf0735..83bc278de8 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -2,8 +2,12 @@ namespace Tests; +use FireflyIII\User; use Illuminate\Foundation\Testing\TestCase as BaseTestCase; - +use Log; +use Mockery; +use FireflyIII\Models\Preference; +use Carbon\Carbon; /** * Class TestCase * @@ -12,4 +16,75 @@ use Illuminate\Foundation\Testing\TestCase as BaseTestCase; abstract class TestCase extends BaseTestCase { use CreatesApplication; + + /** + * @return User + */ + public function user() + { + $user = User::find(1); + + return $user; + } + + /** + * @param User $user + * @param string $range + */ + public function changeDateRange(User $user, $range) + { + $valid = ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom']; + if (in_array($range, $valid)) { + Preference::where('user_id', $user->id)->where('name', 'viewRange')->delete(); + Preference::create( + [ + 'user_id' => $user->id, + 'name' => 'viewRange', + 'data' => $range, + ] + ); + // set period to match? + + } + if ($range === 'custom') { + $this->session( + [ + 'start' => Carbon::now()->subDays(20), + 'end' => Carbon::now(), + ] + ); + } + } + + + /** + * @param string $class + * + * @return \Mockery\MockInterface + */ + protected function mock($class) + { + Log::debug(sprintf('Will now mock %s', $class)); + $object = Mockery::mock($class); + $this->app->instance($class, $object); + + return $object; + } + + /** + * @return array + */ + public function dateRangeProvider() + { + return [ + 'one day' => ['1D'], + 'one week' => ['1W'], + 'one month' => ['1M'], + 'three months' => ['3M'], + 'six months' => ['6M'], + 'one year' => ['1Y'], + 'custom range' => ['custom'], + ]; + } + } From e15bb05823cb89f75c495c8c27364fbbe5bd7d88 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 11:47:22 +0100 Subject: [PATCH 078/276] New test for attachments. --- .../Controllers/AttachmentControllerTest.php | 112 ++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 tests/Feature/Controllers/AttachmentControllerTest.php diff --git a/tests/Feature/Controllers/AttachmentControllerTest.php b/tests/Feature/Controllers/AttachmentControllerTest.php new file mode 100644 index 0000000000..b7d84ad060 --- /dev/null +++ b/tests/Feature/Controllers/AttachmentControllerTest.php @@ -0,0 +1,112 @@ +be($this->user()); + $this->call('GET', route('attachments.delete', [1])); + $this->assertResponseStatus(200); + // has bread crumb + $this->see('
                                                                                                                                                                                                                  '); + } + + /** + * @covers \FireflyIII\Http\Controllers\AttachmentController::destroy + */ + public function testDestroy() + { + $this->session(['attachments.delete.url' => 'http://localhost']); + + $repository = $this->mock(AttachmentRepositoryInterface::class); + $repository->shouldReceive('destroy')->andReturn(true); + $this->be($this->user()); + $this->call('post', route('attachments.destroy', [1])); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\AttachmentController::download + */ + public function testDownload() + { + $repository = $this->mock(AttachmentRepositoryInterface::class); + $repository->shouldReceive('exists')->once()->andReturn(true); + $repository->shouldReceive('getContent')->once()->andReturn('This is attachment number one.'); + + $this->be($this->user()); + $this->call('GET', route('attachments.download', [1])); + $this->assertResponseStatus(200); + // has bread crumb + $this->see('This is attachment number one.'); + } + + /** + * @covers \FireflyIII\Http\Controllers\AttachmentController::edit + */ + public function testEdit() + { + $this->be($this->user()); + $this->call('GET', route('attachments.edit', [1])); + $this->assertResponseStatus(200); + // has bread crumb + $this->see('
                                                                                                                                                                                                                    '); + } + + /** + * @covers \FireflyIII\Http\Controllers\AttachmentController::preview + */ + public function testPreview() + { + $this->be($this->user()); + $this->call('GET', route('attachments.preview', [1])); + $this->assertResponseStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\AttachmentController::update + */ + public function testUpdate() + { + $this->session(['attachments.edit.url' => 'http://localhost']); + $data = [ + 'title' => 'Some updated title ' . rand(1000, 9999), + 'notes' => '', + 'description' => '', + ]; + + $this->be($this->user()); + $this->call('post', route('attachments.update', [1]), $data); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); + + // view should be updated + $this->be($this->user()); + $this->call('GET', route('attachments.edit', [1])); + $this->assertResponseStatus(200); + // has bread crumb + $this->see('
                                                                                                                                                                                                                      '); + $this->see($data['title']); + } + + +} \ No newline at end of file From ac63a082aaf4963661bf64ebdfb45de41b563571 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 11:53:04 +0100 Subject: [PATCH 079/276] Update attachment controller test. --- .../Controllers/AttachmentControllerTest.php | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/Feature/Controllers/AttachmentControllerTest.php b/tests/Feature/Controllers/AttachmentControllerTest.php index b7d84ad060..39f8cab2b6 100644 --- a/tests/Feature/Controllers/AttachmentControllerTest.php +++ b/tests/Feature/Controllers/AttachmentControllerTest.php @@ -23,10 +23,10 @@ class AttachmentControllerTest extends TestCase public function testDelete() { $this->be($this->user()); - $this->call('GET', route('attachments.delete', [1])); - $this->assertResponseStatus(200); + $response = $this->get(route('attachments.delete', [1])); + $response->assertStatus(200); // has bread crumb - $this->see('
                                                                                                                                                                                                                        '); + $response->assertSee('
                                                                                                                                                                                                                          '); } /** @@ -39,9 +39,9 @@ class AttachmentControllerTest extends TestCase $repository = $this->mock(AttachmentRepositoryInterface::class); $repository->shouldReceive('destroy')->andReturn(true); $this->be($this->user()); - $this->call('post', route('attachments.destroy', [1])); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); + $response = $this->post(route('attachments.destroy', [1])); + $response->assertStatus(302); + $response->assertSessionHas('success'); } /** @@ -54,10 +54,10 @@ class AttachmentControllerTest extends TestCase $repository->shouldReceive('getContent')->once()->andReturn('This is attachment number one.'); $this->be($this->user()); - $this->call('GET', route('attachments.download', [1])); - $this->assertResponseStatus(200); + $response = $this->get(route('attachments.download', [1])); + $response->assertStatus(200); // has bread crumb - $this->see('This is attachment number one.'); + $response->assertSee('This is attachment number one.'); } /** @@ -66,10 +66,10 @@ class AttachmentControllerTest extends TestCase public function testEdit() { $this->be($this->user()); - $this->call('GET', route('attachments.edit', [1])); - $this->assertResponseStatus(200); + $response = $this->get(route('attachments.edit', [1])); + $response->assertStatus(200); // has bread crumb - $this->see('
                                                                                                                                                                                                                            '); + $response->assertSee('
                                                                                                                                                                                                                              '); } /** @@ -78,8 +78,8 @@ class AttachmentControllerTest extends TestCase public function testPreview() { $this->be($this->user()); - $this->call('GET', route('attachments.preview', [1])); - $this->assertResponseStatus(200); + $response = $this->get(route('attachments.preview', [1])); + $response->assertStatus(200); } /** @@ -95,17 +95,17 @@ class AttachmentControllerTest extends TestCase ]; $this->be($this->user()); - $this->call('post', route('attachments.update', [1]), $data); - $this->assertResponseStatus(302); - $this->assertSessionHas('success'); + $response = $this->post(route('attachments.update', [1]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); // view should be updated $this->be($this->user()); - $this->call('GET', route('attachments.edit', [1])); - $this->assertResponseStatus(200); + $response = $this->get(route('attachments.edit', [1])); + $response->assertStatus(200); // has bread crumb - $this->see('
                                                                                                                                                                                                                                '); - $this->see($data['title']); + $response->assertSee('
                                                                                                                                                                                                                                  '); + $response->assertSee($data['title']); } From 69bd292ed8f02d1932259ac3bb70ff43e3347664 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 12:00:11 +0100 Subject: [PATCH 080/276] Initial set of empty controller tests --- .../Controllers/AccountControllerTest.php | 2 +- .../Controllers/AttachmentControllerTest.php | 2 +- .../Controllers/BillControllerTest.php | 20 +++++++++++++++++++ .../Controllers/BudgetControllerTest.php | 19 ++++++++++++++++++ .../Controllers/CategoryControllerTest.php | 19 ++++++++++++++++++ .../Controllers/CurrencyControllerTest.php | 19 ++++++++++++++++++ .../Controllers/ExportControllerTest.php | 19 ++++++++++++++++++ .../Controllers/HelpControllerTest.php | 19 ++++++++++++++++++ .../Controllers/HomeControllerTest.php | 19 ++++++++++++++++++ .../Controllers/ImportControllerTest.php | 19 ++++++++++++++++++ .../Controllers/JsonControllerTest.php | 19 ++++++++++++++++++ .../Controllers/NewUserControllerTest.php | 19 ++++++++++++++++++ .../Controllers/PiggyBankControllerTest.php | 19 ++++++++++++++++++ .../Controllers/PreferencesControllerTest.php | 19 ++++++++++++++++++ .../Controllers/ProfileControllerTest.php | 19 ++++++++++++++++++ .../Controllers/ReportControllerTest.php | 19 ++++++++++++++++++ .../Controllers/RuleControllerTest.php | 19 ++++++++++++++++++ .../Controllers/RuleGroupControllerTest.php | 19 ++++++++++++++++++ .../Controllers/SearchControllerTest.php | 19 ++++++++++++++++++ .../Feature/Controllers/TagControllerTest.php | 19 ++++++++++++++++++ .../Controllers/TransactionControllerTest.php | 19 ++++++++++++++++++ 21 files changed, 364 insertions(+), 2 deletions(-) create mode 100644 tests/Feature/Controllers/BillControllerTest.php create mode 100644 tests/Feature/Controllers/BudgetControllerTest.php create mode 100644 tests/Feature/Controllers/CategoryControllerTest.php create mode 100644 tests/Feature/Controllers/CurrencyControllerTest.php create mode 100644 tests/Feature/Controllers/ExportControllerTest.php create mode 100644 tests/Feature/Controllers/HelpControllerTest.php create mode 100644 tests/Feature/Controllers/HomeControllerTest.php create mode 100644 tests/Feature/Controllers/ImportControllerTest.php create mode 100644 tests/Feature/Controllers/JsonControllerTest.php create mode 100644 tests/Feature/Controllers/NewUserControllerTest.php create mode 100644 tests/Feature/Controllers/PiggyBankControllerTest.php create mode 100644 tests/Feature/Controllers/PreferencesControllerTest.php create mode 100644 tests/Feature/Controllers/ProfileControllerTest.php create mode 100644 tests/Feature/Controllers/ReportControllerTest.php create mode 100644 tests/Feature/Controllers/RuleControllerTest.php create mode 100644 tests/Feature/Controllers/RuleGroupControllerTest.php create mode 100644 tests/Feature/Controllers/SearchControllerTest.php create mode 100644 tests/Feature/Controllers/TagControllerTest.php create mode 100644 tests/Feature/Controllers/TransactionControllerTest.php diff --git a/tests/Feature/Controllers/AccountControllerTest.php b/tests/Feature/Controllers/AccountControllerTest.php index 37c9b79740..aa4f23e378 100644 --- a/tests/Feature/Controllers/AccountControllerTest.php +++ b/tests/Feature/Controllers/AccountControllerTest.php @@ -9,7 +9,7 @@ declare(strict_types = 1); -namespace Feature\Controllers; +namespace Tests\Feature\Controllers; use Carbon\Carbon; use FireflyIII\Helpers\Collector\JournalCollectorInterface; diff --git a/tests/Feature/Controllers/AttachmentControllerTest.php b/tests/Feature/Controllers/AttachmentControllerTest.php index 39f8cab2b6..b405130351 100644 --- a/tests/Feature/Controllers/AttachmentControllerTest.php +++ b/tests/Feature/Controllers/AttachmentControllerTest.php @@ -9,7 +9,7 @@ declare(strict_types = 1); -namespace Feature\Controllers; +namespace Tests\Feature\Controllers; use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface; diff --git a/tests/Feature/Controllers/BillControllerTest.php b/tests/Feature/Controllers/BillControllerTest.php new file mode 100644 index 0000000000..7f096c34ce --- /dev/null +++ b/tests/Feature/Controllers/BillControllerTest.php @@ -0,0 +1,20 @@ + Date: Sun, 12 Feb 2017 12:21:44 +0100 Subject: [PATCH 081/276] First set of new tests. --- app/Http/Controllers/HomeController.php | 109 +------- public/js/ff/charts.defaults.js | 2 +- routes/web.php | 1 - .../Controllers/BillControllerTest.php | 149 +++++++++++ .../Controllers/BudgetControllerTest.php | 253 ++++++++++++++++++ .../Controllers/CategoryControllerTest.php | 228 ++++++++++++++++ .../Controllers/CurrencyControllerTest.php | 112 ++++++++ .../Controllers/ExportControllerTest.php | 83 ++++++ .../Controllers/HelpControllerTest.php | 17 ++ .../Controllers/HomeControllerTest.php | 67 +++++ .../Controllers/ImportControllerTest.php | 149 +++++++++++ .../Controllers/JsonControllerTest.php | 130 +++++++++ .../Controllers/NewUserControllerTest.php | 26 ++ .../Controllers/PiggyBankControllerTest.php | 211 +++++++++++++++ .../Controllers/PreferencesControllerTest.php | 59 ++++ .../Controllers/ProfileControllerTest.php | 68 +++++ .../Controllers/ReportControllerTest.php | 75 ++++++ .../Controllers/RuleControllerTest.php | 198 ++++++++++++++ .../Controllers/RuleGroupControllerTest.php | 142 ++++++++++ .../Controllers/SearchControllerTest.php | 19 ++ .../Feature/Controllers/TagControllerTest.php | 105 ++++++++ .../Controllers/TransactionControllerTest.php | 61 +++++ tests/TestCase.php | 64 +++-- 23 files changed, 2193 insertions(+), 135 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 9263a25937..7473aa1bb1 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -17,10 +17,8 @@ use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\AccountType; -use FireflyIII\Models\Tag; use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI; use FireflyIII\Repositories\Bill\BillRepositoryInterface; -use FireflyIII\Repositories\Tag\TagRepositoryInterface; use Illuminate\Http\Request; use Illuminate\Support\Collection; use Log; @@ -86,30 +84,14 @@ class HomeController extends Controller } /** - * @param TagRepositoryInterface $repository + * @param Request $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function flush(TagRepositoryInterface $repository) + public function flush(Request $request) { - Preferences::mark(); - - // get all tags. - // update all counts: - $tags = $repository->get(); - - /** @var Tag $tag */ - foreach ($tags as $tag) { - foreach ($tag->transactionJournals()->get() as $journal) { - $count = $journal->tags()->count(); - $journal->tag_count = $count; - $journal->save(); - } - } - Session::forget(['start', 'end', 'viewRange', 'range', 'is_custom_range']); - - Session::clear(); + $request->session()->forget(['start', 'end', 'viewRange', 'range', 'is_custom_range']); Artisan::call('cache:clear'); return redirect(route('index')); @@ -159,74 +141,6 @@ class HomeController extends Controller ); } - /** - * Display a list of named routes. Excludes some that cannot be "shown". This method - * is used to generate help files (down the road). - */ - public function routes() - { - // these routes are not relevant for the help pages: - $ignore = [ - // login and two-factor routes: - 'login', - 'registe', - 'password.rese', - 'logout', - 'two-fac', - 'lost-two', - // test troutes - 'test-flash', - 'all-routes', - // json routes - 'json.', - // routes that point to modals or that redirect immediately. - 'piggy-banks.add', - 'piggy-banks.remove', - 'rules.rule.up', - 'attachments.download', - 'bills.rescan', - 'rules.rule.down', - 'rules.rule-group.up', - 'rules.rule-group.down', - 'popup.', - 'error', - 'flush', - //'preferences.', - 'admin.users.domains.block-', - 'help.', - // ajax routes: - 'import.json', - // charts: - 'chart.', - // report data: - 'report-data.', - - // others: - 'debugbar', - 'attachments.preview', - 'budgets.income', - 'currencies.default', - - - ]; - $routes = Route::getRoutes(); - $return = '
                                                                                                                                                                                                                                  ';
-
-        /** @var \Illuminate\Routing\Route $route */
-        foreach ($routes as $route) {
-            $name    = $route->getName();
-            $methods = $route->getMethods();
-
-            if (!is_null($name) && strlen($name) > 0 && in_array('GET', $methods) && !$this->startsWithAny($ignore, $name)) {
-                $return .= sprintf('touch %s.md', $name) . "\n";
-
-            }
-        }
-        $return .= '
                                                                                                                                                                                                                                  '; - - return $return; - } - /** * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ @@ -240,21 +154,4 @@ class HomeController extends Controller return redirect(route('home')); } - /** - * @param array $array - * @param string $needle - * - * @return bool - */ - private function startsWithAny(array $array, string $needle): bool - { - foreach ($array as $entry) { - if ((substr($needle, 0, strlen($entry)) === $entry)) { - return true; - } - } - - return false; - } - } diff --git a/public/js/ff/charts.defaults.js b/public/js/ff/charts.defaults.js index 24095df4da..4679f6565b 100644 --- a/public/js/ff/charts.defaults.js +++ b/public/js/ff/charts.defaults.js @@ -12,7 +12,7 @@ var defaultChartOptions = { elements: { - line : { + line: { cubicInterpolationMode: 'monotone' } }, diff --git a/routes/web.php b/routes/web.php index 8a7b9c8eb7..1210b72f1a 100755 --- a/routes/web.php +++ b/routes/web.php @@ -74,7 +74,6 @@ Route::group( Route::get('/flash', ['uses' => 'HomeController@testFlash', 'as' => 'test-flash']); Route::get('/home', ['uses' => 'HomeController@index', 'as' => 'home']); Route::post('/daterange', ['uses' => 'HomeController@dateRange', 'as' => 'daterange']); - Route::get('/routes', ['uses' => 'HomeController@routes', 'as' => 'all-routes']); } ); diff --git a/tests/Feature/Controllers/BillControllerTest.php b/tests/Feature/Controllers/BillControllerTest.php index 7f096c34ce..ea538a2a27 100644 --- a/tests/Feature/Controllers/BillControllerTest.php +++ b/tests/Feature/Controllers/BillControllerTest.php @@ -12,9 +12,158 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers; +use FireflyIII\Repositories\Bill\BillRepositoryInterface; +use Illuminate\Support\Collection; use Tests\TestCase; class BillControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\BillController::create + */ + public function testCreate() + { + $this->be($this->user()); + $response = $this->get(route('bills.create')); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                    '); + } + + /** + * @covers \FireflyIII\Http\Controllers\BillController::delete + */ + public function testDelete() + { + $this->be($this->user()); + $response = $this->get(route('bills.delete', [1])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                      '); + } + + /** + * @covers \FireflyIII\Http\Controllers\BillController::destroy + */ + public function testDestroy() + { + $repository = $this->mock(BillRepositoryInterface::class); + $repository->shouldReceive('destroy')->andReturn(true); + + $this->session(['bills.delete.url' => 'http://localhost']); + $this->be($this->user()); + $response = $this->post(route('bills.destroy', [1])); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\BillController::edit + */ + public function testEdit() + { + $this->be($this->user()); + $response = $this->get(route('bills.edit', [1])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                        '); + } + + /** + * @covers \FireflyIII\Http\Controllers\BillController::index + */ + public function testIndex() + { + $this->be($this->user()); + $response = $this->get(route('bills.index')); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                          '); + } + + /** + * @covers \FireflyIII\Http\Controllers\BillController::rescan + */ + public function testRescan() + { + $repository = $this->mock(BillRepositoryInterface::class); + $repository->shouldReceive('getPossiblyRelatedJournals')->once()->andReturn(new Collection); + $this->be($this->user()); + $response = $this->get(route('bills.rescan', [1])); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\BillController::show + */ + public function testShow() + { + $this->be($this->user()); + $response = $this->get(route('bills.show', [1])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                            '); + } + + /** + * @covers \FireflyIII\Http\Controllers\BillController::store + */ + public function testStore() + { + $data = [ + 'name' => 'New Bill ' . rand(1000, 9999), + 'match' => 'some words', + 'amount_min' => '100', + 'amount_currency_id_amount_min' => 1, + 'amount_currency_id_amount_max' => 1, + 'skip' => 0, + 'amount_max' => '100', + 'date' => '2016-01-01', + 'repeat_freq' => 'monthly', + ]; + $this->session(['bills.create.url' => 'http://localhost']); + $this->be($this->user()); + $response = $this->post(route('bills.store'), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + + // list must be updated + $this->be($this->user()); + $response = $this->get(route('bills.index')); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                              '); + $response->assertSee($data['name']); + } + + /** + * @covers \FireflyIII\Http\Controllers\BillController::update + */ + public function testUpdate() + { + $data = [ + 'name' => 'Updated Bill ' . rand(1000, 9999), + 'match' => 'some more words', + 'amount_min' => '100', + 'amount_currency_id_amount_min' => 1, + 'amount_currency_id_amount_max' => 1, + 'skip' => 0, + 'amount_max' => '100', + 'date' => '2016-01-01', + 'repeat_freq' => 'monthly', + ]; + $this->session(['bills.edit.url' => 'http://localhost']); + $this->be($this->user()); + $response = $this->post(route('bills.update', [1]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + + // list must be updated + $this->be($this->user()); + $response = $this->get(route('bills.index')); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                '); + $response->assertSee($data['name']); + } } \ No newline at end of file diff --git a/tests/Feature/Controllers/BudgetControllerTest.php b/tests/Feature/Controllers/BudgetControllerTest.php index 8c1ce793ba..321fda6c6d 100644 --- a/tests/Feature/Controllers/BudgetControllerTest.php +++ b/tests/Feature/Controllers/BudgetControllerTest.php @@ -11,9 +11,262 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers; +use Carbon\Carbon; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use Illuminate\Pagination\LengthAwarePaginator; +use Illuminate\Support\Collection; use Tests\TestCase; class BudgetControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\BudgetController::amount + */ + public function testAmount() + { + $data = [ + 'amount' => 200, + ]; + $this->be($this->user()); + $response = $this->post(route('budgets.amount', [1]), $data); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\BudgetController::create + */ + public function testCreate() + { + $this->be($this->user()); + $response = $this->get(route('budgets.create')); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                  '); + } + + /** + * @covers \FireflyIII\Http\Controllers\BudgetController::delete + */ + public function testDelete() + { + $this->be($this->user()); + $response = $this->get(route('budgets.delete', [1])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                    '); + } + + /** + * @covers \FireflyIII\Http\Controllers\BudgetController::destroy + */ + public function testDestroy() + { + $this->session(['budgets.delete.url' => 'http://localhost']); + + $repository = $this->mock(BudgetRepositoryInterface::class); + $repository->shouldReceive('destroy')->andReturn(true); + + $this->be($this->user()); + $response = $this->post(route('budgets.destroy', [1])); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\BudgetController::edit + */ + public function testEdit() + { + $this->be($this->user()); + $response = $this->get(route('budgets.edit', [1])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                      '); + } + + /** + * @covers \FireflyIII\Http\Controllers\BudgetController::index + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testIndex(string $range) + { + $repository = $this->mock(BudgetRepositoryInterface::class); + $repository->shouldReceive('cleanupBudgets'); + $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection); + $repository->shouldReceive('getInactiveBudgets')->andReturn(new Collection); + $repository->shouldReceive('getAvailableBudget')->andReturn('100.123'); + + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('budgets.index')); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                        '); + } + + /** + * @covers \FireflyIII\Http\Controllers\BudgetController::noBudget + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testNoBudget(string $range) + { + $date = new Carbon(); + $this->session(['start' => $date, 'end' => clone $date]); + + $collector = $this->mock(JournalCollectorInterface::class); + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('setLimit')->andReturnSelf(); + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('withoutBudget')->andReturnSelf(); + $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('budgets.no-budget')); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                          '); + } + + /** + * @covers \FireflyIII\Http\Controllers\BudgetController::postUpdateIncome + */ + public function testPostUpdateIncome() + { + $data = [ + 'amount' => '200', + ]; + $this->be($this->user()); + $response = $this->post(route('budgets.income.post'), $data); + $response->assertStatus(302); + } + + /** + * @covers \FireflyIII\Http\Controllers\BudgetController::show + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testShow(string $range) + { + $date = new Carbon(); + $date->subDay(); + $this->session(['first' => $date]); + + // mock account repository + $accountRepository = $this->mock(AccountRepositoryInterface::class); + $accountRepository->shouldReceive('getAccountsByType')->andReturn(new Collection); + + + // mock budget repository + $budgetRepository = $this->mock(BudgetRepositoryInterface::class); + $budgetRepository->shouldReceive('getBudgetLimits')->andReturn(new Collection); + $budgetRepository->shouldReceive('spentInPeriod')->andReturn('1'); + // mock journal collector: + $collector = $this->mock(JournalCollectorInterface::class); + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('setLimit')->andReturnSelf(); + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('setBudget')->andReturnSelf(); + $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('budgets.show', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                            '); + } + + /** + * @covers \FireflyIII\Http\Controllers\BudgetController::showByBudgetLimit() + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testShowByBudgetLimit(string $range) + { + // mock account repository + $accountRepository = $this->mock(AccountRepositoryInterface::class); + $accountRepository->shouldReceive('getAccountsByType')->andReturn(new Collection); + + // mock budget repository + $budgetRepository = $this->mock(BudgetRepositoryInterface::class); + $budgetRepository->shouldReceive('spentInPeriod')->andReturn('1'); + $budgetRepository->shouldReceive('getBudgetLimits')->andReturn(new Collection); + + // mock journal collector: + $collector = $this->mock(JournalCollectorInterface::class); + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('setLimit')->andReturnSelf(); + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('setBudget')->andReturnSelf(); + $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('budgets.show.limit', [1, 1])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                              '); + } + + /** + * @covers \FireflyIII\Http\Controllers\BudgetController::store + */ + public function testStore() + { + $this->session(['budgets.create.url' => 'http://localhost']); + + $data = [ + 'name' => 'New Budget ' . rand(1000, 9999), + ]; + $this->be($this->user()); + $response = $this->post(route('budgets.store'), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\BudgetController::update + */ + public function testUpdate() + { + $this->session(['budgets.edit.url' => 'http://localhost']); + + $data = [ + 'name' => 'Updated Budget ' . rand(1000, 9999), + 'active' => 1, + ]; + $this->be($this->user()); + $response = $this->post(route('budgets.update', [1]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\BudgetController::updateIncome + */ + public function testUpdateIncome() + { + // must be in list + $this->be($this->user()); + $response = $this->get(route('budgets.income', [1])); + $response->assertStatus(200); + } } \ No newline at end of file diff --git a/tests/Feature/Controllers/CategoryControllerTest.php b/tests/Feature/Controllers/CategoryControllerTest.php index f14630ff1c..43b69b4bb6 100644 --- a/tests/Feature/Controllers/CategoryControllerTest.php +++ b/tests/Feature/Controllers/CategoryControllerTest.php @@ -11,9 +11,237 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers; +use Carbon\Carbon; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Category\CategoryRepositoryInterface; +use Illuminate\Pagination\LengthAwarePaginator; +use Illuminate\Support\Collection; use Tests\TestCase; class CategoryControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\CategoryController::create + */ + public function testCreate() + { + $this->be($this->user()); + $response = $this->get(route('categories.create')); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                '); + } + + /** + * @covers \FireflyIII\Http\Controllers\CategoryController::delete + */ + public function testDelete() + { + $this->be($this->user()); + $response = $this->get(route('categories.delete', [1])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                  '); + } + + /** + * @covers \FireflyIII\Http\Controllers\CategoryController::destroy + */ + public function testDestroy() + { + $this->session(['categories.delete.url' => 'http://localhost']); + $repository = $this->mock(CategoryRepositoryInterface::class); + $repository->shouldReceive('destroy')->andReturn(true); + + $this->be($this->user()); + $response = $this->post(route('categories.destroy', [1])); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\CategoryController::edit + */ + public function testEdit() + { + $this->be($this->user()); + $response = $this->get(route('categories.edit', [1])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                    '); + } + + /** + * @covers \FireflyIII\Http\Controllers\CategoryController::index + */ + public function testIndex() + { + $this->be($this->user()); + $response = $this->get(route('categories.index')); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                      '); + } + + /** + * @covers \FireflyIII\Http\Controllers\CategoryController::noCategory + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testNoCategory(string $range) + { + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('categories.no-category')); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                        '); + } + + /** + * @covers \FireflyIII\Http\Controllers\CategoryController::show + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testShow(string $range) + { + + $collector = $this->mock(JournalCollectorInterface::class); + $accRepository = $this->mock(AccountRepositoryInterface::class); + $catRepository = $this->mock(CategoryRepositoryInterface::class); + + $accRepository->shouldReceive('getAccountsByType')->once()->andReturn(new Collection); + $catRepository->shouldReceive('firstUseDate')->once()->andReturn(new Carbon); + + // collector stuff: + $collector->shouldReceive('setPage')->andReturnSelf()->once(); + $collector->shouldReceive('setLimit')->andReturnSelf()->once(); + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->once(); + $collector->shouldReceive('setRange')->andReturnSelf()->once(); + $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); + $collector->shouldReceive('setCategory')->andReturnSelf()->once(); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10))->once(); + + // more repos stuff: + $catRepository->shouldReceive('spentInPeriod')->andReturn('0'); + $catRepository->shouldReceive('earnedInPeriod')->andReturn('0'); + + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('categories.show', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                          '); + } + + /** + * @covers \FireflyIII\Http\Controllers\CategoryController::showAll + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testShowAll(string $range) + { + $collector = $this->mock(JournalCollectorInterface::class); + + // collector stuff: + $collector->shouldReceive('setPage')->andReturnSelf()->once(); + $collector->shouldReceive('setLimit')->andReturnSelf()->once(); + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->once(); + $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); + $collector->shouldReceive('setCategory')->andReturnSelf()->once(); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10))->once(); + + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('categories.show.all', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                            '); + } + + /** + * @covers \FireflyIII\Http\Controllers\CategoryController::showByDate + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testShowByDate(string $range) + { + $collector = $this->mock(JournalCollectorInterface::class); + + // collector stuff: + $collector->shouldReceive('setPage')->andReturnSelf()->once(); + $collector->shouldReceive('setLimit')->andReturnSelf()->once(); + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->once(); + $collector->shouldReceive('setRange')->andReturnSelf()->once(); + $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); + $collector->shouldReceive('setCategory')->andReturnSelf()->once(); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10))->once(); + + // mock category repository + $repository = $this->mock(CategoryRepositoryInterface::class); + $repository->shouldReceive('firstUseDate')->once()->andReturn(new Carbon); + $repository->shouldReceive('spentInPeriod')->andReturn('-1'); + $repository->shouldReceive('earnedInPeriod')->andReturn('1'); + + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('categories.show.date', [1, '2015-01-01'])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                              '); + } + + /** + * @covers \FireflyIII\Http\Controllers\CategoryController::store + */ + public function testStore() + { + $this->session(['categories.create.url' => 'http://localhost']); + + $data = [ + 'name' => 'New Category ' . rand(1000, 9999), + ]; + $this->be($this->user()); + $response = $this->post(route('categories.store'), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + + // must be in list + $this->be($this->user()); + $response = $this->get(route('categories.index')); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                '); + $response->assertSee($data['name']); + } + + /** + * @covers \FireflyIII\Http\Controllers\CategoryController::update + */ + public function testUpdate() + { + $this->session(['categories.edit.url' => 'http://localhost']); + + $data = [ + 'name' => 'Updated Category ' . rand(1000, 9999), + 'active' => 1, + ]; + $this->be($this->user()); + $response = $this->post(route('categories.update', [1]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + + // must be in list + $this->be($this->user()); + $response = $this->get(route('categories.index')); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                  '); + $response->assertSee($data['name']); + } + } \ No newline at end of file diff --git a/tests/Feature/Controllers/CurrencyControllerTest.php b/tests/Feature/Controllers/CurrencyControllerTest.php index e07827fc47..bacd25268b 100644 --- a/tests/Feature/Controllers/CurrencyControllerTest.php +++ b/tests/Feature/Controllers/CurrencyControllerTest.php @@ -11,9 +11,121 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use Tests\TestCase; class CurrencyControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\CurrencyController::create + */ + public function testCreate() + { + $this->be($this->user()); + $response = $this->get(route('currencies.create')); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                    '); + } + + /** + * @covers \FireflyIII\Http\Controllers\CurrencyController::defaultCurrency + */ + public function testDefaultCurrency() + { + $this->be($this->user()); + $response = $this->get(route('currencies.default', [1])); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\CurrencyController::delete + */ + public function testDelete() + { + $this->be($this->user()); + $response = $this->get(route('currencies.delete', [2])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                      '); + } + + /** + * @covers \FireflyIII\Http\Controllers\CurrencyController::destroy + */ + public function testDestroy() + { + $this->session(['currencies.delete.url' => 'http://localhost']); + $repository = $this->mock(CurrencyRepositoryInterface::class); + $repository->shouldReceive('canDeleteCurrency')->andReturn(true); + $repository->shouldReceive('destroy')->andReturn(true); + + $this->be($this->user()); + $response = $this->post(route('currencies.destroy', [1])); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\CurrencyController::edit + */ + public function testEdit() + { + $this->be($this->user()); + $response = $this->get(route('currencies.edit', [2])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                        '); + } + + /** + * @covers \FireflyIII\Http\Controllers\CurrencyController::index + */ + public function testIndex() + { + $this->be($this->user()); + $response = $this->get(route('currencies.index')); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                          '); + } + + /** + * @covers \FireflyIII\Http\Controllers\CurrencyController::store + */ + public function testStore() + { + $this->session(['currencies.create.url' => 'http://localhost']); + $data = [ + 'name' => 'XX', + 'code' => 'XXX', + 'symbol' => 'x', + 'decimal_places' => 2, + ]; + $this->be($this->user()); + $response = $this->post(route('currencies.store'), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\CurrencyController::update + */ + public function testUpdate() + { + $this->session(['currencies.edit.url' => 'http://localhost']); + $data = [ + 'name' => 'XA', + 'code' => 'XAX', + 'symbol' => 'a', + 'decimal_places' => 2, + ]; + $this->be($this->user()); + $response = $this->post(route('currencies.update', [2]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + } \ No newline at end of file diff --git a/tests/Feature/Controllers/ExportControllerTest.php b/tests/Feature/Controllers/ExportControllerTest.php index ef38ddc937..6e72c1ccf9 100644 --- a/tests/Feature/Controllers/ExportControllerTest.php +++ b/tests/Feature/Controllers/ExportControllerTest.php @@ -11,9 +11,92 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers; +use Carbon\Carbon; +use FireflyIII\Export\ProcessorInterface; +use FireflyIII\Models\ExportJob; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface; +use Illuminate\Support\Collection; use Tests\TestCase; class ExportControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\ExportController::download + */ + public function testDownload() + { + $repository = $this->mock(ExportJobRepositoryInterface::class); + $repository->shouldReceive('exists')->once()->andReturn(true); + $repository->shouldReceive('getContent')->once()->andReturn('Some content beep boop'); + + $this->be($this->user()); + $response = $this->get(route('export.download', ['testExport'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\ExportController::getStatus + */ + public function testGetStatus() + { + $this->be($this->user()); + $response = $this->get(route('export.status', ['testExport'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\ExportController::index + */ + public function testIndex() + { + $this->be($this->user()); + $response = $this->get(route('export.index')); + $response->assertStatus(200); + + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                            '); + } + + /** + * @covers \FireflyIII\Http\Controllers\ExportController::postIndex + */ + public function testPostIndex() + { + $this->session( + ['first' => new Carbon('2014-01-01')] + ); + + + $data = [ + + 'export_start_range' => '2015-01-01', + 'export_end_range' => '2015-01-21', + 'exportFormat' => 'csv', + 'accounts' => [1], + 'job' => 'testExport', + ]; + + $accountRepository = $this->mock(AccountRepositoryInterface::class); + $accountRepository->shouldReceive('getAccountsById')->withArgs([$data['accounts']])->andReturn(new Collection); + + $processor = $this->mock(ProcessorInterface::class); + $processor->shouldReceive('setSettings')->once(); + $processor->shouldReceive('collectJournals')->once(); + $processor->shouldReceive('convertJournals')->once(); + $processor->shouldReceive('exportJournals')->once(); + $processor->shouldReceive('createZipFile')->once(); + + $repository = $this->mock(ExportJobRepositoryInterface::class); + $repository->shouldReceive('changeStatus')->andReturn(true); + $repository->shouldReceive('findByKey')->andReturn(new ExportJob); + + $this->be($this->user()); + + $response = $this->post(route('export.export'), $data); + $response->assertStatus(200); + $response->assertSee('ok'); + } + } \ No newline at end of file diff --git a/tests/Feature/Controllers/HelpControllerTest.php b/tests/Feature/Controllers/HelpControllerTest.php index 90d81a5093..63eb9017e4 100644 --- a/tests/Feature/Controllers/HelpControllerTest.php +++ b/tests/Feature/Controllers/HelpControllerTest.php @@ -11,9 +11,26 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers; +use FireflyIII\Helpers\Help\HelpInterface; use Tests\TestCase; class HelpControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\HelpController::show + */ + public function testShow() + { + $help = $this->mock(HelpInterface::class); + $help->shouldReceive('hasRoute')->andReturn(true)->once(); + $help->shouldReceive('inCache')->andReturn(false)->once(); + $help->shouldReceive('getFromGithub')->andReturn('Help content here.')->once(); + $help->shouldReceive('putInCache')->once(); + + $this->be($this->user()); + $response = $this->get(route('help.show', ['index'])); + $response->assertStatus(200); + } + } \ No newline at end of file diff --git a/tests/Feature/Controllers/HomeControllerTest.php b/tests/Feature/Controllers/HomeControllerTest.php index 4bbf838743..d5d76041d5 100644 --- a/tests/Feature/Controllers/HomeControllerTest.php +++ b/tests/Feature/Controllers/HomeControllerTest.php @@ -15,5 +15,72 @@ use Tests\TestCase; class HomeControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\HomeController::dateRange + * @covers \FireflyIII\Http\Controllers\HomeController::__construct + */ + public function testDateRange() + { + + $this->be($this->user()); + + $args = [ + 'start' => '2012-01-01', + 'end' => '2012-04-01', + ]; + + $response = $this->post(route('daterange'), $args); + $response->assertStatus(200); + $response->assertSessionHas('warning', '91 days of data may take a while to load.'); + } + + /** + * @covers \FireflyIII\Http\Controllers\HomeController::displayError + */ + public function testDisplayError() + { + $this->be($this->user()); + $response = $this->get(route('error')); + $response->assertStatus(500); + } + + /** + * @covers \FireflyIII\Http\Controllers\HomeController::flush + */ + public function testFlush() + { + $this->be($this->user()); + $response = $this->get(route('flush')); + $response->assertStatus(302); + } + + /** + * @covers \FireflyIII\Http\Controllers\HomeController::index + * @covers \FireflyIII\Http\Controllers\Controller::__construct + * @dataProvider dateRangeProvider + * + * @param $range + */ + public function testIndex(string $range) + { + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('index')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\HomeController::testFlash + */ + public function testTestFlash() + { + $this->be($this->user()); + $response = $this->get(route('test-flash')); + $response->assertStatus(302); + $response->assertSessionHas('success'); + $response->assertSessionHas('info'); + $response->assertSessionHas('warning'); + $response->assertSessionHas('error'); + } } \ No newline at end of file diff --git a/tests/Feature/Controllers/ImportControllerTest.php b/tests/Feature/Controllers/ImportControllerTest.php index ba33608fe1..44b95a88dd 100644 --- a/tests/Feature/Controllers/ImportControllerTest.php +++ b/tests/Feature/Controllers/ImportControllerTest.php @@ -11,9 +11,158 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers; +use FireflyIII\Import\ImportProcedureInterface; +use FireflyIII\Import\Setup\CsvSetup; use Tests\TestCase; +use Illuminate\Http\UploadedFile; class ImportControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\ImportController::complete + */ + public function testComplete() + { + $this->be($this->user()); + $response = $this->get(route('import.complete', ['complete'])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                              '); + } + + /** + * @covers \FireflyIII\Http\Controllers\ImportController::configure + */ + public function testConfigure() + { + $this->be($this->user()); + $response = $this->get(route('import.configure', ['configure'])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                '); + } + + /** + * @covers \FireflyIII\Http\Controllers\ImportController::download + */ + public function testDownload() + { + $this->be($this->user()); + $response = $this->get(route('import.download', ['configure'])); + $response->assertStatus(200); + $response->assertSee('[]'); + } + + /** + * @covers \FireflyIII\Http\Controllers\ImportController::finished + */ + public function testFinished() + { + $this->be($this->user()); + $response = $this->get(route('import.finished', ['finished'])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                  '); + } + + /** + * @covers \FireflyIII\Http\Controllers\ImportController::index + */ + public function testIndex() + { + $this->be($this->user()); + $response = $this->get(route('import.index')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\ImportController::json + */ + public function testJson() + { + $this->be($this->user()); + $response = $this->get(route('import.json', ['configure'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\ImportController::postConfigure + */ + public function testPostConfigure() + { + $importer = $this->mock(CsvSetup::class); + $importer->shouldReceive('setJob')->once(); + $importer->shouldReceive('saveImportConfiguration')->once(); + + $data = []; + $this->be($this->user()); + $response = $this->post(route('import.process-configuration', ['p-configure']), $data); + $response->assertStatus(302); + $this->assertRedirectedToRoute('import.settings', ['p-configure']); + } + + /** + * @covers \FireflyIII\Http\Controllers\ImportController::postSettings + */ + public function testPostSettings() + { + $importer = $this->mock(CsvSetup::class); + $importer->shouldReceive('setJob')->once(); + $importer->shouldReceive('storeSettings')->once(); + $data = []; + $this->be($this->user()); + $response = $this->post(route('import.post-settings', ['p-settings']), $data); + $response->assertStatus(302); + $this->assertRedirectedToRoute('import.settings', ['p-settings']); + } + + /** + * @covers \FireflyIII\Http\Controllers\ImportController::settings + */ + public function testSettings() + { + $importer = $this->mock(CsvSetup::class); + $importer->shouldReceive('setJob')->once(); + $importer->shouldReceive('requireUserSettings')->once()->andReturn(false); + $this->be($this->user()); + $response = $this->get(route('import.settings', ['settings'])); + $response->assertStatus(302); + $this->assertRedirectedToRoute('import.complete', ['settings']); + } + + /** + * @covers \FireflyIII\Http\Controllers\ImportController::start + */ + public function testStart() + { + /** @var ImportProcedureInterface $procedure */ + $procedure = $this->mock(ImportProcedureInterface::class); + + $procedure->shouldReceive('runImport'); + + $this->be($this->user()); + $response = $this->post(route('import.start', ['complete'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\ImportController::status + * Implement testStatus(). + */ + public function testStatus() + { + // complete + $this->be($this->user()); + $response = $this->get(route('import.status', ['complete'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\ImportController::upload + */ + public function testUpload() + { + $path = resource_path('stubs/csv.csv'); + $file = new UploadedFile($path, 'upload.csv', filesize($path), 'text/csv', null, true); + $response = $this->post(route('import.upload'), [], [], ['import_file' => $file], ['Accept' => 'application/json']); + $response->assertStatus(302); + } } \ No newline at end of file diff --git a/tests/Feature/Controllers/JsonControllerTest.php b/tests/Feature/Controllers/JsonControllerTest.php index 5eee1de137..19064a4e98 100644 --- a/tests/Feature/Controllers/JsonControllerTest.php +++ b/tests/Feature/Controllers/JsonControllerTest.php @@ -16,4 +16,134 @@ use Tests\TestCase; class JsonControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\JsonController::action + */ + public function testAction() + { + $this->be($this->user()); + $response = $this->get(route('json.action')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\JsonController::boxBillsPaid + */ + public function testBoxBillsPaid() + { + $this->be($this->user()); + $response = $this->get(route('json.box.paid')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\JsonController::boxBillsUnpaid + */ + public function testBoxBillsUnpaid() + { + $this->be($this->user()); + $response = $this->get(route('json.box.unpaid')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\JsonController::boxIn + */ + public function testBoxIn() + { + $this->be($this->user()); + $response = $this->get(route('json.box.in')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\JsonController::boxOut + */ + public function testBoxOut() + { + $this->be($this->user()); + $response = $this->get(route('json.box.out')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\JsonController::categories + */ + public function testCategories() + { + $this->be($this->user()); + $response = $this->get(route('json.categories')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\JsonController::endTour + */ + public function testEndTour() + { + $this->be($this->user()); + $response = $this->post(route('json.end-tour')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\JsonController::expenseAccounts + */ + public function testExpenseAccounts() + { + $this->be($this->user()); + $response = $this->get(route('json.expense-accounts')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\JsonController::revenueAccounts + */ + public function testRevenueAccounts() + { + $this->be($this->user()); + $response = $this->get(route('json.revenue-accounts')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\JsonController::tags + */ + public function testTags() + { + $this->be($this->user()); + $response = $this->get(route('json.tags')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\JsonController::tour + */ + public function testTour() + { + $this->be($this->user()); + $response = $this->get(route('json.tour')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\JsonController::transactionJournals + */ + public function testTransactionJournals() + { + $this->be($this->user()); + $response = $this->get(route('json.transaction-journals', ['deposit'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\JsonController::trigger + */ + public function testTrigger() + { + $this->be($this->user()); + $response = $this->get(route('json.trigger')); + $response->assertStatus(200); + } + } \ No newline at end of file diff --git a/tests/Feature/Controllers/NewUserControllerTest.php b/tests/Feature/Controllers/NewUserControllerTest.php index 7b0f34007d..f8b82bbff1 100644 --- a/tests/Feature/Controllers/NewUserControllerTest.php +++ b/tests/Feature/Controllers/NewUserControllerTest.php @@ -16,4 +16,30 @@ use Tests\TestCase; class NewUserControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\NewUserController::index + */ + public function testIndex() + { + $this->be($this->emptyUser()); + $response = $this->get(route('new-user.index')); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                    '); + } + + /** + * @covers \FireflyIII\Http\Controllers\NewUserController::submit + */ + public function testSubmit() + { + $data = [ + 'bank_name' => 'New bank', + 'bank_balance' => 100, + ]; + $this->be($this->emptyUser()); + $response = $this->post(route('new-user.submit'), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + } \ No newline at end of file diff --git a/tests/Feature/Controllers/PiggyBankControllerTest.php b/tests/Feature/Controllers/PiggyBankControllerTest.php index 5ec0b57c27..470a4994b2 100644 --- a/tests/Feature/Controllers/PiggyBankControllerTest.php +++ b/tests/Feature/Controllers/PiggyBankControllerTest.php @@ -16,4 +16,215 @@ use Tests\TestCase; class PiggyBankControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\PiggyBankController::add + */ + public function testAdd() + { + $this->be($this->user()); + $response = $this->get(route('piggy-banks.add', [1])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\PiggyBankController::addMobile + */ + public function testAddMobile() + { + $this->be($this->user()); + $response = $this->get(route('piggy-banks.add-money-mobile', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                      '); + } + + /** + * @covers \FireflyIII\Http\Controllers\PiggyBankController::create + */ + public function testCreate() + { + $this->be($this->user()); + $response = $this->get(route('piggy-banks.create')); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                        '); + } + + /** + * @covers \FireflyIII\Http\Controllers\PiggyBankController::delete + */ + public function testDelete() + { + $this->be($this->user()); + $response = $this->get(route('piggy-banks.delete', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                          '); + } + + /** + * @covers \FireflyIII\Http\Controllers\PiggyBankController::destroy + */ + public function testDestroy() + { + $repository = $this->mock(PiggyBankRepositoryInterface::class); + $repository->shouldReceive('destroy')->andReturn(true); + + $this->session(['piggy-banks.delete.url' => 'http://localhost']); + $this->be($this->user()); + $response = $this->post(route('piggy-banks.destroy', [2])); + $response->assertStatus(302); + $response->assertSessionHas('success'); + $this->assertRedirectedToRoute('index'); + } + + /** + * @covers \FireflyIII\Http\Controllers\PiggyBankController::edit + */ + public function testEdit() + { + $this->be($this->user()); + $response = $this->get(route('piggy-banks.edit', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                            '); + } + + /** + * @covers \FireflyIII\Http\Controllers\PiggyBankController::index + */ + public function testIndex() + { + $this->be($this->user()); + $response = $this->get(route('piggy-banks.index')); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                              '); + } + + /** + * @covers \FireflyIII\Http\Controllers\PiggyBankController::order + */ + public function testOrder() + { + $this->be($this->user()); + $response = $this->post(route('piggy-banks.order', [1, 2])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\PiggyBankController::postAdd + */ + public function testPostAdd() + { + $data = ['amount' => '1.123']; + $this->be($this->user()); + $response = $this->post(route('piggy-banks.add', [1]), $data); + $response->assertStatus(302); + $this->assertRedirectedToRoute('piggy-banks.index'); + $response->assertSessionHas('success'); + } + + /** + * Add the exact amount to fill a piggy bank + * + * @covers \FireflyIII\Http\Controllers\PiggyBankController::postAdd + */ + public function testPostAddExact() + { + // find a piggy with current amount = 0. + $piggy = PiggyBank::leftJoin('piggy_bank_repetitions', 'piggy_bank_repetitions.piggy_bank_id', '=', 'piggy_banks.id') + ->where('currentamount', 0) + ->first(['piggy_banks.id', 'targetamount']); + + + $data = ['amount' => strval($piggy->targetamount)]; + $this->be($this->user()); + $response = $this->post(route('piggy-banks.add', [$piggy->id]), $data); + $response->assertStatus(302); + $this->assertRedirectedToRoute('piggy-banks.index'); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\PiggyBankController::postRemove + */ + public function testPostRemove() + { + $data = ['amount' => '1.123']; + $this->be($this->user()); + $response = $this->post(route('piggy-banks.remove', [1]), $data); + $response->assertStatus(302); + $this->assertRedirectedToRoute('piggy-banks.index'); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\PiggyBankController::remove + */ + public function testRemove() + { + $this->be($this->user()); + $response = $this->get(route('piggy-banks.remove', [1])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\PiggyBankController::removeMobile + */ + public function testRemoveMobile() + { + $this->be($this->user()); + $response = $this->get(route('piggy-banks.remove-money-mobile', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                '); + } + + /** + * @covers \FireflyIII\Http\Controllers\PiggyBankController::show + */ + public function testShow() + { + $this->be($this->user()); + $response = $this->get(route('piggy-banks.show', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                  '); + } + + /** + * @covers \FireflyIII\Http\Controllers\PiggyBankController::store + */ + public function testStore() + { + $this->session(['piggy-banks.create.url' => 'http://localhost']); + $data = [ + 'name' => 'Piggy ' . rand(999, 10000), + 'targetamount' => '100.123', + 'account_id' => 2, + 'amount_currency_id_targetamount' => 1, + + ]; + $this->be($this->user()); + $response = $this->post(route('piggy-banks.store'), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + $this->assertRedirectedToRoute('index'); + } + + /** + * @covers \FireflyIII\Http\Controllers\PiggyBankController::update + */ + public function testUpdate() + { + $this->session(['piggy-banks.edit.url' => 'http://localhost']); + $data = [ + 'name' => 'Updated Piggy ' . rand(999, 10000), + 'targetamount' => '100.123', + 'account_id' => 2, + 'amount_currency_id_targetamount' => 1, + + ]; + $this->be($this->user()); + $response = $this->post(route('piggy-banks.update', [3]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + $this->assertRedirectedToRoute('index'); + } + + } \ No newline at end of file diff --git a/tests/Feature/Controllers/PreferencesControllerTest.php b/tests/Feature/Controllers/PreferencesControllerTest.php index d79a78f635..034d15836b 100644 --- a/tests/Feature/Controllers/PreferencesControllerTest.php +++ b/tests/Feature/Controllers/PreferencesControllerTest.php @@ -16,4 +16,63 @@ use Tests\TestCase; class PreferencesControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\PreferencesController::code + */ + public function testCode() + { + $this->be($this->user()); + $response = $this->get(route('preferences.code')); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                    '); + } + + /** + * @covers \FireflyIII\Http\Controllers\PreferencesController::deleteCode + */ + public function testDeleteCode() + { + $this->be($this->user()); + $response = $this->get(route('preferences.delete-code')); + $response->assertStatus(302); + $response->assertSessionHas('success'); + $response->assertSessionHas('info'); + $this->assertRedirectedToRoute('preferences.index'); + } + + /** + * @covers \FireflyIII\Http\Controllers\PreferencesController::index + */ + public function testIndex() + { + $this->be($this->user()); + $response = $this->get(route('preferences.index')); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                      '); + } + + /** + * @covers \FireflyIII\Http\Controllers\PreferencesController::postIndex + */ + public function testPostIndex() + { + $data = [ + 'fiscalYearStart' => '2016-01-01', + 'frontPageAccounts' => [], + 'viewRange' => '1M', + 'customFiscalYear' => 0, + 'showDepositsFrontpage' => 0, + 'transactionPageSize' => 100, + 'twoFactorAuthEnabled' => 0, + 'language' => 'en_US', + 'tj' => [], + ]; + + $this->be($this->user()); + $response = $this->post(route('preferences.update'), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + $this->assertRedirectedToRoute('preferences.index'); + } + } \ No newline at end of file diff --git a/tests/Feature/Controllers/ProfileControllerTest.php b/tests/Feature/Controllers/ProfileControllerTest.php index 3a98d2ae4a..e69359b4af 100644 --- a/tests/Feature/Controllers/ProfileControllerTest.php +++ b/tests/Feature/Controllers/ProfileControllerTest.php @@ -16,4 +16,72 @@ use Tests\TestCase; class ProfileControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\ProfileController::changePassword + */ + public function testChangePassword() + { + $this->be($this->user()); + $response = $this->get(route('profile.change-password')); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                        '); + } + + /** + * @covers \FireflyIII\Http\Controllers\ProfileController::deleteAccount + */ + public function testDeleteAccount() + { + $this->be($this->user()); + $response = $this->get(route('profile.delete-account')); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                          '); + } + + /** + * @covers \FireflyIII\Http\Controllers\ProfileController::index + */ + public function testIndex() + { + $this->be($this->user()); + $response = $this->get(route('profile.index')); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                            '); + } + + /** + * @covers \FireflyIII\Http\Controllers\ProfileController::postChangePassword + */ + public function testPostChangePassword() + { + $repository = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('changePassword'); + + $data = [ + 'current_password' => 'james', + 'new_password' => 'james2', + 'new_password_confirmation' => 'james2', + ]; + $this->be($this->user()); + $response = $this->post(route('profile.change-password.post'), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\ProfileController::postDeleteAccount + */ + public function testPostDeleteAccount() + { + $repository = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('destroy'); + $data = [ + 'password' => 'james', + ]; + $this->be($this->user()); + $response = $this->post(route('profile.delete-account.post'), $data); + $response->assertStatus(302); + $this->assertRedirectedToRoute('index'); + } + } \ No newline at end of file diff --git a/tests/Feature/Controllers/ReportControllerTest.php b/tests/Feature/Controllers/ReportControllerTest.php index 094a233284..83cb8e1da3 100644 --- a/tests/Feature/Controllers/ReportControllerTest.php +++ b/tests/Feature/Controllers/ReportControllerTest.php @@ -16,4 +16,79 @@ use Tests\TestCase; class ReportControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\ReportController::auditReport + */ + public function testAuditReport() + { + $this->be($this->user()); + $response = $this->get(route('reports.report.audit', [1, '20160101', '20160131'])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                              '); + } + + /** + * @covers \FireflyIII\Http\Controllers\ReportController::budgetReport + */ + public function testBudgetReport() + { + $this->be($this->user()); + $response = $this->get(route('reports.report.budget', [1, 1, '20160101', '20160131'])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                '); + } + + /** + * @covers \FireflyIII\Http\Controllers\ReportController::categoryReport + */ + public function testCategoryReport() + { + $this->be($this->user()); + $response = $this->get(route('reports.report.category', [1, 1, '20160101', '20160131'])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                  '); + } + + /** + * @covers \FireflyIII\Http\Controllers\ReportController::defaultReport + */ + public function testDefaultReport() + { + $this->be($this->user()); + $response = $this->get(route('reports.report.default', [1, '20160101', '20160131'])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                    '); + } + + /** + * @covers \FireflyIII\Http\Controllers\ReportController::index + */ + public function testIndex() + { + $this->be($this->user()); + $response = $this->get(route('reports.index')); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                      '); + } + + /** + * @covers \FireflyIII\Http\Controllers\ReportController::options + */ + public function testOptions() + { + $this->be($this->user()); + $response = $this->get(route('reports.options', ['default'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\ReportController::postIndex + */ + public function testPostIndex() + { + $this->be($this->user()); + $response = $this->post(route('reports.index.post')); + $response->assertStatus(302); + } + } \ No newline at end of file diff --git a/tests/Feature/Controllers/RuleControllerTest.php b/tests/Feature/Controllers/RuleControllerTest.php index 9dac939b49..e1887da73c 100644 --- a/tests/Feature/Controllers/RuleControllerTest.php +++ b/tests/Feature/Controllers/RuleControllerTest.php @@ -16,4 +16,202 @@ use Tests\TestCase; class RuleControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\RuleController::create + */ + public function testCreate() + { + $this->be($this->user()); + $response = $this->get(route('rules.create', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                        '); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleController::delete + */ + public function testDelete() + { + $this->be($this->user()); + $response = $this->get(route('rules.delete', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                          '); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleController::destroy + */ + public function testDestroy() + { + $repository = $this->mock(RuleRepositoryInterface::class); + $repository->shouldReceive('destroy'); + + $this->session(['rules.delete.url' => 'http://localhost']); + $this->be($this->user()); + $response = $this->post(route('rules.destroy', [1])); + $response->assertStatus(302); + $response->assertSessionHas('success'); + $this->assertRedirectedToRoute('index'); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleController::down + */ + public function testDown() + { + $this->be($this->user()); + $response = $this->get(route('rules.down', [1])); + $response->assertStatus(302); + $this->assertRedirectedToRoute('rules.index'); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleController::edit + */ + public function testEdit() + { + $this->be($this->user()); + $response = $this->get(route('rules.edit', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                            '); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleController::index + */ + public function testIndex() + { + $this->be($this->user()); + $response = $this->get(route('rules.index')); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                              '); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleController::reorderRuleActions + */ + public function testReorderRuleActions() + { + $data = [ + 'triggers' => [1, 2, 3], + ]; + + $repository = $this->mock(RuleRepositoryInterface::class); + $repository->shouldReceive('reorderRuleActions'); + + $this->be($this->user()); + $response = $this->post(route('rules.reorder-actions', [1]), $data); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleController::reorderRuleTriggers + */ + public function testReorderRuleTriggers() + { + $data = [ + 'triggers' => [1, 2, 3], + ]; + + $repository = $this->mock(RuleRepositoryInterface::class); + $repository->shouldReceive('reorderRuleTriggers'); + + $this->be($this->user()); + $response = $this->post(route('rules.reorder-triggers', [1]), $data); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleController::store + */ + public function testStore() + { + $this->session(['rules.create.url' => 'http://localhost']); + $data = [ + 'rule_group_id' => 1, + 'active' => 1, + 'title' => 'A', + 'trigger' => 'store-journal', + 'description' => 'D', + 'rule-trigger' => [ + 1 => 'from_account_starts', + ], + 'rule-trigger-value' => [ + 1 => 'B', + ], + 'rule-action' => [ + 1 => 'set_category', + ], + 'rule-action-value' => [ + 1 => 'C', + ], + ]; + + $repository = $this->mock(RuleRepositoryInterface::class); + $repository->shouldReceive('store')->andReturn(new Rule); + + $this->be($this->user()); + $response = $this->post(route('rules.store', [1]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * This actually hits an error and not the actually code but OK. + * + * @covers \FireflyIII\Http\Controllers\RuleController::testTriggers + */ + public function testTestTriggers() + { + $this->be($this->user()); + $response = $this->get(route('rules.test-triggers', [1])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleController::up + */ + public function testUp() + { + $this->be($this->user()); + $response = $this->get(route('rules.up', [1])); + $response->assertStatus(302); + $this->assertRedirectedToRoute('rules.index'); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleController::update + */ + public function testUpdate() + { + $data = [ + 'rule_group_id' => 1, + 'title' => 'Your first default rule', + 'trigger' => 'store-journal', + 'active' => 1, + 'description' => 'This rule is an example. You can safely delete it.', + 'rule-trigger' => [ + 1 => 'description_is', + ], + 'rule-trigger-value' => [ + 1 => 'something', + ], + 'rule-action' => [ + 1 => 'prepend_description', + ], + 'rule-action-value' => [ + 1 => 'Bla bla', + ], + ]; + $this->session(['rules.edit.url' => 'http://localhost']); + + $repository = $this->mock(RuleRepositoryInterface::class); + $repository->shouldReceive('update'); + + $this->be($this->user()); + $response = $this->post(route('rules.update', [1]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + } \ No newline at end of file diff --git a/tests/Feature/Controllers/RuleGroupControllerTest.php b/tests/Feature/Controllers/RuleGroupControllerTest.php index 38bc98a0cf..02dad517a3 100644 --- a/tests/Feature/Controllers/RuleGroupControllerTest.php +++ b/tests/Feature/Controllers/RuleGroupControllerTest.php @@ -16,4 +16,146 @@ use Tests\TestCase; class RuleGroupControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\RuleGroupController::create + */ + public function testCreate() + { + $this->be($this->user()); + $response = $this->get(route('rule-groups.create')); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                '); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleGroupController::delete + */ + public function testDelete() + { + $this->be($this->user()); + $response = $this->get(route('rule-groups.delete', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                  '); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleGroupController::destroy + */ + public function testDestroy() + { + $repository = $this->mock(RuleGroupRepositoryInterface::class); + $repository->shouldReceive('destroy'); + + $this->session(['rule-groups.delete.url' => 'http://localhost']); + $this->be($this->user()); + $response = $this->post(route('rule-groups.destroy', [1])); + $response->assertStatus(302); + $response->assertSessionHas('success'); + $this->assertRedirectedToRoute('index'); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleGroupController::down + */ + public function testDown() + { + $this->be($this->user()); + $response = $this->get(route('rule-groups.down', [1])); + $response->assertStatus(302); + $this->assertRedirectedToRoute('rules.index'); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleGroupController::edit + */ + public function testEdit() + { + $this->be($this->user()); + $response = $this->get(route('rule-groups.edit', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                    '); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleGroupController::execute + */ + public function testExecute() + { + $this->session(['first' => new Carbon('2010-01-01')]); + $data = [ + 'accounts' => [1], + 'start_date' => '2010-01-02', + 'end_date' => '2010-01-02', + ]; + $this->be($this->user()); + $response = $this->post(route('rule-groups.execute', [1]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + $this->assertRedirectedToRoute('rules.index'); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleGroupController::selectTransactions + */ + public function testSelectTransactions() + { + $this->be($this->user()); + $response = $this->get(route('rule-groups.select-transactions', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                      '); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleGroupController::store + */ + public function testStore() + { + $this->session(['rule-groups.create.url' => 'http://localhost']); + $data = [ + 'title' => 'A', + 'description' => '', + ]; + + $repository = $this->mock(RuleGroupRepositoryInterface::class); + $repository->shouldReceive('store')->andReturn(new RuleGroup); + $repository->shouldReceive('find')->andReturn(new RuleGroup); + + $this->be($this->user()); + $response = $this->post(route('rule-groups.store', [1]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleGroupController::up + */ + public function testUp() + { + $this->be($this->user()); + $response = $this->get(route('rule-groups.up', [1])); + $response->assertStatus(302); + $this->assertRedirectedToRoute('rules.index'); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleGroupController::update + */ + public function testUpdate() + { + $data = [ + 'title' => 'C', + 'description' => 'XX', + ]; + $this->session(['rule-groups.edit.url' => 'http://localhost']); + + $repository = $this->mock(RuleGroupRepositoryInterface::class); + $repository->shouldReceive('update'); + $repository->shouldReceive('find')->andReturn(new RuleGroup); + + $this->be($this->user()); + $response = $this->post(route('rule-groups.update', [1]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + } \ No newline at end of file diff --git a/tests/Feature/Controllers/SearchControllerTest.php b/tests/Feature/Controllers/SearchControllerTest.php index 181c2686df..23dfe78cd6 100644 --- a/tests/Feature/Controllers/SearchControllerTest.php +++ b/tests/Feature/Controllers/SearchControllerTest.php @@ -16,4 +16,23 @@ use Tests\TestCase; class SearchControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\SearchController::index + * Implement testIndex(). + */ + public function testIndex() + { + $search = $this->mock(SearchInterface::class); + $search->shouldReceive('setLimit')->once(); + $search->shouldReceive('searchTransactions')->andReturn(new Collection)->withArgs([['test']])->once(); + $search->shouldReceive('searchBudgets')->andReturn(new Collection)->withArgs([['test']])->once(); + $search->shouldReceive('searchTags')->andReturn(new Collection)->withArgs([['test']])->once(); + $search->shouldReceive('searchCategories')->andReturn(new Collection)->withArgs([['test']])->once(); + $search->shouldReceive('searchAccounts')->andReturn(new Collection)->withArgs([['test']])->once(); + $this->be($this->user()); + $response = $this->get(route('search.index') . '?q=test'); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                        '); + } + } \ No newline at end of file diff --git a/tests/Feature/Controllers/TagControllerTest.php b/tests/Feature/Controllers/TagControllerTest.php index 90108801f6..4d4155c827 100644 --- a/tests/Feature/Controllers/TagControllerTest.php +++ b/tests/Feature/Controllers/TagControllerTest.php @@ -16,4 +16,109 @@ use Tests\TestCase; class TagControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\TagController::create + */ + public function testCreate() + { + $this->be($this->user()); + $response = $this->get(route('tags.create')); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                          '); + } + + /** + * @covers \FireflyIII\Http\Controllers\TagController::delete + */ + public function testDelete() + { + $this->be($this->user()); + $response = $this->get(route('tags.delete', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                            '); + } + + /** + * @covers \FireflyIII\Http\Controllers\TagController::destroy + */ + public function testDestroy() + { + $repository = $this->mock(TagRepositoryInterface::class); + $repository->shouldReceive('destroy'); + + $this->be($this->user()); + $response = $this->post(route('tags.destroy', [1])); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\TagController::edit + */ + public function testEdit() + { + $this->be($this->user()); + $response = $this->get(route('tags.edit', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                              '); + } + + /** + * @covers \FireflyIII\Http\Controllers\TagController::index + */ + public function testIndex() + { + $this->be($this->user()); + $response = $this->get(route('tags.index')); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                '); + } + + /** + * @covers \FireflyIII\Http\Controllers\TagController::show + */ + public function testShow() + { + $this->be($this->user()); + $response = $this->get(route('tags.show', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                  '); + } + + /** + * @covers \FireflyIII\Http\Controllers\TagController::store + */ + public function testStore() + { + $this->session(['tags.create.url' => 'http://localhost']); + $data = [ + 'tag' => 'Hello new tag' . rand(999, 10000), + 'tagMode' => 'nothing', + ]; + $this->be($this->user()); + $response = $this->post(route('tags.store'), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\TagController::update + */ + public function testUpdate() + { + $this->session(['tags.edit.url' => 'http://localhost']); + $data = [ + 'tag' => 'Hello updated tag' . rand(999, 10000), + 'tagMode' => 'nothing', + ]; + $repository = $this->mock(TagRepositoryInterface::class); + $repository->shouldReceive('update'); + $repository->shouldReceive('find')->andReturn(new Tag); + + $this->be($this->user()); + $response = $this->post(route('tags.update', [1]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + } \ No newline at end of file diff --git a/tests/Feature/Controllers/TransactionControllerTest.php b/tests/Feature/Controllers/TransactionControllerTest.php index 939349c3fc..595c99bfb3 100644 --- a/tests/Feature/Controllers/TransactionControllerTest.php +++ b/tests/Feature/Controllers/TransactionControllerTest.php @@ -16,4 +16,65 @@ use Tests\TestCase; class TransactionControllerTest extends TestCase { + /** + * @covers \FireflyIII\Http\Controllers\TransactionController::index + */ + public function testIndex() + { + + $this->be($this->user()); + $response = $this->get(route('transactions.index', ['transfer'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                    '); + } + + /** + * @covers \FireflyIII\Http\Controllers\TransactionController::indexAll + */ + public function testIndexAll() + { + $this->be($this->user()); + $response = $this->get(route('transactions.index.all', ['transfer'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                      '); + } + + /** + * @covers \FireflyIII\Http\Controllers\TransactionController::indexByDate + */ + public function testIndexByDate() + { + $this->be($this->user()); + $response = $this->get(route('transactions.index.date', ['transfer', '2016-01-01'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                        '); + } + + /** + * @covers \FireflyIII\Http\Controllers\TransactionController::reorder + */ + public function testReorder() + { + $data = [ + 'items' => [], + ]; + $this->be($this->user()); + $response = $this->post(route('transactions.reorder'), $data); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\TransactionController::show + */ + public function testShow() + { + $this->be($this->user()); + $response = $this->get(route('transactions.show', [1])); + $response->assertStatus(200); + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                          '); + } + } \ No newline at end of file diff --git a/tests/TestCase.php b/tests/TestCase.php index 83bc278de8..72d9dd4995 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -2,12 +2,13 @@ namespace Tests; +use Carbon\Carbon; +use FireflyIII\Models\Preference; use FireflyIII\User; use Illuminate\Foundation\Testing\TestCase as BaseTestCase; use Log; use Mockery; -use FireflyIII\Models\Preference; -use Carbon\Carbon; + /** * Class TestCase * @@ -17,16 +18,6 @@ abstract class TestCase extends BaseTestCase { use CreatesApplication; - /** - * @return User - */ - public function user() - { - $user = User::find(1); - - return $user; - } - /** * @param User $user * @param string $range @@ -56,21 +47,6 @@ abstract class TestCase extends BaseTestCase } } - - /** - * @param string $class - * - * @return \Mockery\MockInterface - */ - protected function mock($class) - { - Log::debug(sprintf('Will now mock %s', $class)); - $object = Mockery::mock($class); - $this->app->instance($class, $object); - - return $object; - } - /** * @return array */ @@ -87,4 +63,38 @@ abstract class TestCase extends BaseTestCase ]; } + /** + * @return User + */ + public function emptyUser() + { + $user = User::find(2); + + return $user; + } + + /** + * @return User + */ + public function user() + { + $user = User::find(1); + + return $user; + } + + /** + * @param string $class + * + * @return \Mockery\MockInterface + */ + protected function mock($class) + { + Log::debug(sprintf('Will now mock %s', $class)); + $object = Mockery::mock($class); + $this->app->instance($class, $object); + + return $object; + } + } From 79f94771c3fabadcd61b8b4c6713fcaa52cd5228 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 12:32:13 +0100 Subject: [PATCH 082/276] Make tests compatible with laravel 5.4 --- tests/Feature/Controllers/ImportControllerTest.php | 6 +++--- .../Feature/Controllers/PiggyBankControllerTest.php | 13 +++++++------ .../Controllers/PreferencesControllerTest.php | 4 ++-- tests/Feature/Controllers/ProfileControllerTest.php | 2 +- tests/Feature/Controllers/RuleControllerTest.php | 6 +++--- .../Feature/Controllers/RuleGroupControllerTest.php | 8 ++++---- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/tests/Feature/Controllers/ImportControllerTest.php b/tests/Feature/Controllers/ImportControllerTest.php index 44b95a88dd..14c219bb8c 100644 --- a/tests/Feature/Controllers/ImportControllerTest.php +++ b/tests/Feature/Controllers/ImportControllerTest.php @@ -95,7 +95,7 @@ class ImportControllerTest extends TestCase $this->be($this->user()); $response = $this->post(route('import.process-configuration', ['p-configure']), $data); $response->assertStatus(302); - $this->assertRedirectedToRoute('import.settings', ['p-configure']); + $response->assertRedirect(route('import.settings', ['p-configure'])); } /** @@ -110,7 +110,7 @@ class ImportControllerTest extends TestCase $this->be($this->user()); $response = $this->post(route('import.post-settings', ['p-settings']), $data); $response->assertStatus(302); - $this->assertRedirectedToRoute('import.settings', ['p-settings']); + $response->assertRedirect(route('import.settings', ['p-settings'])); } /** @@ -124,7 +124,7 @@ class ImportControllerTest extends TestCase $this->be($this->user()); $response = $this->get(route('import.settings', ['settings'])); $response->assertStatus(302); - $this->assertRedirectedToRoute('import.complete', ['settings']); + $response->assertRedirect(route('import.complete', ['settings'])); } /** diff --git a/tests/Feature/Controllers/PiggyBankControllerTest.php b/tests/Feature/Controllers/PiggyBankControllerTest.php index 470a4994b2..d43e21e087 100644 --- a/tests/Feature/Controllers/PiggyBankControllerTest.php +++ b/tests/Feature/Controllers/PiggyBankControllerTest.php @@ -11,6 +11,7 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers; +use FireflyIII\Models\PiggyBank; use Tests\TestCase; class PiggyBankControllerTest extends TestCase @@ -72,7 +73,7 @@ class PiggyBankControllerTest extends TestCase $response = $this->post(route('piggy-banks.destroy', [2])); $response->assertStatus(302); $response->assertSessionHas('success'); - $this->assertRedirectedToRoute('index'); + $response->assertRedirect(route('index')); } /** @@ -116,7 +117,7 @@ class PiggyBankControllerTest extends TestCase $this->be($this->user()); $response = $this->post(route('piggy-banks.add', [1]), $data); $response->assertStatus(302); - $this->assertRedirectedToRoute('piggy-banks.index'); + $response->assertRedirect(route('piggy-banks.index')); $response->assertSessionHas('success'); } @@ -137,7 +138,7 @@ class PiggyBankControllerTest extends TestCase $this->be($this->user()); $response = $this->post(route('piggy-banks.add', [$piggy->id]), $data); $response->assertStatus(302); - $this->assertRedirectedToRoute('piggy-banks.index'); + $response->assertRedirect(route('piggy-banks.index')); $response->assertSessionHas('success'); } @@ -150,7 +151,7 @@ class PiggyBankControllerTest extends TestCase $this->be($this->user()); $response = $this->post(route('piggy-banks.remove', [1]), $data); $response->assertStatus(302); - $this->assertRedirectedToRoute('piggy-banks.index'); + $response->assertRedirect(route('piggy-banks.index')); $response->assertSessionHas('success'); } @@ -203,7 +204,7 @@ class PiggyBankControllerTest extends TestCase $response = $this->post(route('piggy-banks.store'), $data); $response->assertStatus(302); $response->assertSessionHas('success'); - $this->assertRedirectedToRoute('index'); + $response->assertRedirect(route('index')); } /** @@ -223,7 +224,7 @@ class PiggyBankControllerTest extends TestCase $response = $this->post(route('piggy-banks.update', [3]), $data); $response->assertStatus(302); $response->assertSessionHas('success'); - $this->assertRedirectedToRoute('index'); + $response->assertRedirect(route('index')); } diff --git a/tests/Feature/Controllers/PreferencesControllerTest.php b/tests/Feature/Controllers/PreferencesControllerTest.php index 034d15836b..e0a4d35c81 100644 --- a/tests/Feature/Controllers/PreferencesControllerTest.php +++ b/tests/Feature/Controllers/PreferencesControllerTest.php @@ -37,7 +37,7 @@ class PreferencesControllerTest extends TestCase $response->assertStatus(302); $response->assertSessionHas('success'); $response->assertSessionHas('info'); - $this->assertRedirectedToRoute('preferences.index'); + $response->assertRedirect(route('preferences.index')); } /** @@ -72,7 +72,7 @@ class PreferencesControllerTest extends TestCase $response = $this->post(route('preferences.update'), $data); $response->assertStatus(302); $response->assertSessionHas('success'); - $this->assertRedirectedToRoute('preferences.index'); + $response->assertRedirect(route('preferences.index')); } } \ No newline at end of file diff --git a/tests/Feature/Controllers/ProfileControllerTest.php b/tests/Feature/Controllers/ProfileControllerTest.php index e69359b4af..20fce4f183 100644 --- a/tests/Feature/Controllers/ProfileControllerTest.php +++ b/tests/Feature/Controllers/ProfileControllerTest.php @@ -81,7 +81,7 @@ class ProfileControllerTest extends TestCase $this->be($this->user()); $response = $this->post(route('profile.delete-account.post'), $data); $response->assertStatus(302); - $this->assertRedirectedToRoute('index'); + $response->assertRedirect(route('index')); } } \ No newline at end of file diff --git a/tests/Feature/Controllers/RuleControllerTest.php b/tests/Feature/Controllers/RuleControllerTest.php index e1887da73c..29d3bbbed6 100644 --- a/tests/Feature/Controllers/RuleControllerTest.php +++ b/tests/Feature/Controllers/RuleControllerTest.php @@ -51,7 +51,7 @@ class RuleControllerTest extends TestCase $response = $this->post(route('rules.destroy', [1])); $response->assertStatus(302); $response->assertSessionHas('success'); - $this->assertRedirectedToRoute('index'); + $response->assertRedirect(route('index')); } /** @@ -62,7 +62,7 @@ class RuleControllerTest extends TestCase $this->be($this->user()); $response = $this->get(route('rules.down', [1])); $response->assertStatus(302); - $this->assertRedirectedToRoute('rules.index'); + $response->assertRedirect(route('rules.index')); } /** @@ -176,7 +176,7 @@ class RuleControllerTest extends TestCase $this->be($this->user()); $response = $this->get(route('rules.up', [1])); $response->assertStatus(302); - $this->assertRedirectedToRoute('rules.index'); + $response->assertRedirect(route('rules.index')); } /** diff --git a/tests/Feature/Controllers/RuleGroupControllerTest.php b/tests/Feature/Controllers/RuleGroupControllerTest.php index 02dad517a3..70494e8034 100644 --- a/tests/Feature/Controllers/RuleGroupControllerTest.php +++ b/tests/Feature/Controllers/RuleGroupControllerTest.php @@ -51,7 +51,7 @@ class RuleGroupControllerTest extends TestCase $response = $this->post(route('rule-groups.destroy', [1])); $response->assertStatus(302); $response->assertSessionHas('success'); - $this->assertRedirectedToRoute('index'); + $response->assertRedirect(route('index')); } /** @@ -62,7 +62,7 @@ class RuleGroupControllerTest extends TestCase $this->be($this->user()); $response = $this->get(route('rule-groups.down', [1])); $response->assertStatus(302); - $this->assertRedirectedToRoute('rules.index'); + $response->assertRedirect(route('rules.index')); } /** @@ -91,7 +91,7 @@ class RuleGroupControllerTest extends TestCase $response = $this->post(route('rule-groups.execute', [1]), $data); $response->assertStatus(302); $response->assertSessionHas('success'); - $this->assertRedirectedToRoute('rules.index'); + $response->assertRedirect(route('rules.index')); } /** @@ -134,7 +134,7 @@ class RuleGroupControllerTest extends TestCase $this->be($this->user()); $response = $this->get(route('rule-groups.up', [1])); $response->assertStatus(302); - $this->assertRedirectedToRoute('rules.index'); + $response->assertRedirect(route('rules.index')); } /** From 1637190c273d8954a3c1a91a9b0a1fe69f3c9f5b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 13:15:23 +0100 Subject: [PATCH 083/276] Fix various tests. --- app/Http/Requests/RuleGroupFormRequest.php | 1 - tests/Feature/Controllers/ProfileControllerTest.php | 1 + tests/Feature/Controllers/RuleControllerTest.php | 2 ++ tests/Feature/Controllers/RuleGroupControllerTest.php | 3 +++ tests/Feature/Controllers/SearchControllerTest.php | 2 ++ tests/Feature/Controllers/TagControllerTest.php | 2 ++ 6 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/Http/Requests/RuleGroupFormRequest.php b/app/Http/Requests/RuleGroupFormRequest.php index b5917242d7..7d2250882f 100644 --- a/app/Http/Requests/RuleGroupFormRequest.php +++ b/app/Http/Requests/RuleGroupFormRequest.php @@ -50,7 +50,6 @@ class RuleGroupFormRequest extends Request { /** @var RuleGroupRepositoryInterface $repository */ $repository = app(RuleGroupRepositoryInterface::class); - $repository->setUser(auth()->user()); $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title'; if (!is_null($repository->find(intval($this->get('id')))->id)) { $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title,' . intval($this->get('id')); diff --git a/tests/Feature/Controllers/ProfileControllerTest.php b/tests/Feature/Controllers/ProfileControllerTest.php index 20fce4f183..196d4124a6 100644 --- a/tests/Feature/Controllers/ProfileControllerTest.php +++ b/tests/Feature/Controllers/ProfileControllerTest.php @@ -11,6 +11,7 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Tests\TestCase; class ProfileControllerTest extends TestCase diff --git a/tests/Feature/Controllers/RuleControllerTest.php b/tests/Feature/Controllers/RuleControllerTest.php index 29d3bbbed6..f25f2b0999 100644 --- a/tests/Feature/Controllers/RuleControllerTest.php +++ b/tests/Feature/Controllers/RuleControllerTest.php @@ -11,6 +11,8 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers; +use FireflyIII\Models\Rule; +use FireflyIII\Repositories\Rule\RuleRepositoryInterface; use Tests\TestCase; class RuleControllerTest extends TestCase diff --git a/tests/Feature/Controllers/RuleGroupControllerTest.php b/tests/Feature/Controllers/RuleGroupControllerTest.php index 70494e8034..740c5f332f 100644 --- a/tests/Feature/Controllers/RuleGroupControllerTest.php +++ b/tests/Feature/Controllers/RuleGroupControllerTest.php @@ -11,6 +11,9 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers; +use Carbon\Carbon; +use FireflyIII\Models\RuleGroup; +use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use Tests\TestCase; class RuleGroupControllerTest extends TestCase diff --git a/tests/Feature/Controllers/SearchControllerTest.php b/tests/Feature/Controllers/SearchControllerTest.php index 23dfe78cd6..1c53646475 100644 --- a/tests/Feature/Controllers/SearchControllerTest.php +++ b/tests/Feature/Controllers/SearchControllerTest.php @@ -11,6 +11,8 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers; +use FireflyIII\Support\Search\SearchInterface; +use Illuminate\Support\Collection; use Tests\TestCase; class SearchControllerTest extends TestCase diff --git a/tests/Feature/Controllers/TagControllerTest.php b/tests/Feature/Controllers/TagControllerTest.php index 4d4155c827..317278a94b 100644 --- a/tests/Feature/Controllers/TagControllerTest.php +++ b/tests/Feature/Controllers/TagControllerTest.php @@ -11,6 +11,8 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers; +use FireflyIII\Models\Tag; +use FireflyIII\Repositories\Tag\TagRepositoryInterface; use Tests\TestCase; class TagControllerTest extends TestCase From 3399b133ae07931c38f51dc5707994090bfcc5a9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 13:23:08 +0100 Subject: [PATCH 084/276] New user controller tests. --- .../Admin/ConfigurationControllerTest.php | 63 +++++++++++++++++++ .../Controllers/Admin/HomeControllerTest.php | 31 +++++++++ .../Controllers/Admin/UserControllerTest.php | 56 +++++++++++++++++ 3 files changed, 150 insertions(+) create mode 100644 tests/Feature/Controllers/Admin/ConfigurationControllerTest.php create mode 100644 tests/Feature/Controllers/Admin/HomeControllerTest.php create mode 100644 tests/Feature/Controllers/Admin/UserControllerTest.php diff --git a/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php b/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php new file mode 100644 index 0000000000..6d5eccea35 --- /dev/null +++ b/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php @@ -0,0 +1,63 @@ +be($this->user()); + + $falseConfig = new Configuration; + $falseConfig->data = false; + + $trueConfig = new Configuration; + $trueConfig->data = true; + + FireflyConfig::shouldReceive('get')->withArgs(['single_user_mode', true])->once()->andReturn($trueConfig); + FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->times(2)->andReturn($falseConfig); + + $response = $this->get(route('admin.configuration.index')); + $response->assertStatus(200); + + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                            '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Admin\ConfigurationController::postIndex + */ + public function testPostIndex() + { + $falseConfig = new Configuration; + $falseConfig->data = false; + + FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig); + FireflyConfig::shouldReceive('set')->withArgs(['single_user_mode', false])->once(); + FireflyConfig::shouldReceive('set')->withArgs(['is_demo_site', false])->once(); + + $this->be($this->user()); + $response = $this->post(route('admin.configuration.index.post')); + $response->assertSessionHas('success'); + $response->assertStatus(302); + } + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Admin/HomeControllerTest.php b/tests/Feature/Controllers/Admin/HomeControllerTest.php new file mode 100644 index 0000000000..bffa7af54f --- /dev/null +++ b/tests/Feature/Controllers/Admin/HomeControllerTest.php @@ -0,0 +1,31 @@ +be($this->user()); + $response = $this->get(route('admin.index')); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                              '); + } + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Admin/UserControllerTest.php b/tests/Feature/Controllers/Admin/UserControllerTest.php new file mode 100644 index 0000000000..3ecb75fa53 --- /dev/null +++ b/tests/Feature/Controllers/Admin/UserControllerTest.php @@ -0,0 +1,56 @@ +be($this->user()); + $response = $this->get(route('admin.users.edit', [1])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                                '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Admin\UserController::index + */ + public function testIndex() + { + $this->be($this->user()); + $response = $this->get(route('admin.users')); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                                  '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Admin\UserController::show + */ + public function testShow() + { + $this->be($this->user()); + $response = $this->get(route('admin.users.edit', [1])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                                    '); + } + + +} \ No newline at end of file From ec146d4cbeda35787f8f2c98bb62d8b0586d435f Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 16:50:35 +0100 Subject: [PATCH 085/276] =?UTF-8?q?Make=20sure=20the=20/javascript/=20url?= =?UTF-8?q?=E2=80=99s=20are=20ignored.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Auth/LoginController.php | 20 ++++++ app/Http/Controllers/HomeController.php | 2 +- app/Http/Kernel.php | 27 ++++---- app/Http/Middleware/StartFireflySession.php | 55 ++++++++++++++++ app/Providers/FireflySessionProvider.php | 64 +++++++++++++++++++ config/app.php | 2 +- resources/lang/en_US/firefly.php | 3 + resources/views/error.twig | 7 +- resources/views/partials/menu-sidebar.twig | 4 +- test.sh | 10 ++- 10 files changed, 172 insertions(+), 22 deletions(-) create mode 100644 app/Http/Middleware/StartFireflySession.php create mode 100644 app/Providers/FireflySessionProvider.php diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index c6389159b8..016be84894 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -80,6 +80,26 @@ class LoginController extends Controller return $this->sendFailedLoginResponse($request, $errorMessage); } + /** + * @param Request $request + * + * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ + public function logout(Request $request) + { + if (intval(getenv('SANDSTORM')) === 1) { + return view('error')->with('message', strval(trans('firefly.sandstorm_not_available'))); + } + + $this->guard()->logout(); + + $request->session()->flush(); + + $request->session()->regenerate(); + + return redirect('/'); + } + /** * Show the application login form. * diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 7473aa1bb1..9dbce2de32 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -91,7 +91,7 @@ class HomeController extends Controller public function flush(Request $request) { Preferences::mark(); - $request->session()->forget(['start', 'end', 'viewRange', 'range', 'is_custom_range']); + $request->session()->forget(['start', 'end','_previous', 'viewRange', 'range', 'is_custom_range']); Artisan::call('cache:clear'); return redirect(route('index')); diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 488a3857cd..289a6924d1 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -21,6 +21,7 @@ use FireflyIII\Http\Middleware\Range; use FireflyIII\Http\Middleware\RedirectIfAuthenticated; use FireflyIII\Http\Middleware\RedirectIfTwoFactorAuthenticated; use FireflyIII\Http\Middleware\Sandstorm; +use FireflyIII\Http\Middleware\StartFireflySession; use FireflyIII\Http\Middleware\VerifyCsrfToken; use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth; use Illuminate\Auth\Middleware\Authorize; @@ -29,7 +30,6 @@ use Illuminate\Foundation\Http\Kernel as HttpKernel; use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode; use Illuminate\Routing\Middleware\SubstituteBindings; use Illuminate\Routing\Middleware\ThrottleRequests; -use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; /** @@ -51,7 +51,6 @@ class Kernel extends HttpKernel = [ 'Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables', 'Illuminate\Foundation\Bootstrap\LoadConfiguration', - //'FireflyIII\Bootstrap\ConfigureLogging', 'Illuminate\Foundation\Bootstrap\HandleExceptions', 'Illuminate\Foundation\Bootstrap\RegisterFacades', 'Illuminate\Foundation\Bootstrap\RegisterProviders', @@ -80,11 +79,11 @@ class Kernel extends HttpKernel // does not check login // does not check 2fa // does not check activation - 'web' => [ + 'web' => [ Sandstorm::class, EncryptCookies::class, AddQueuedCookiesToResponse::class, - StartSession::class, + StartFireflySession::class, ShareErrorsFromSession::class, VerifyCsrfToken::class, SubstituteBindings::class, @@ -92,11 +91,11 @@ class Kernel extends HttpKernel // MUST NOT be logged in. Does not care about 2FA or confirmation. - 'user-not-logged-in' => [ + 'user-not-logged-in' => [ Sandstorm::class, EncryptCookies::class, AddQueuedCookiesToResponse::class, - StartSession::class, + StartFireflySession::class, ShareErrorsFromSession::class, VerifyCsrfToken::class, SubstituteBindings::class, @@ -105,11 +104,11 @@ class Kernel extends HttpKernel // MUST be logged in. // MUST NOT have 2FA // don't care about confirmation: - 'user-logged-in-no-2fa' => [ + 'user-logged-in-no-2fa' => [ Sandstorm::class, EncryptCookies::class, AddQueuedCookiesToResponse::class, - StartSession::class, + StartFireflySession::class, ShareErrorsFromSession::class, VerifyCsrfToken::class, SubstituteBindings::class, @@ -120,11 +119,11 @@ class Kernel extends HttpKernel // MUST be logged in // don't care about 2fa // don't care about confirmation. - 'user-simple-auth' => [ + 'user-simple-auth' => [ Sandstorm::class, EncryptCookies::class, AddQueuedCookiesToResponse::class, - StartSession::class, + StartFireflySession::class, ShareErrorsFromSession::class, VerifyCsrfToken::class, SubstituteBindings::class, @@ -135,11 +134,11 @@ class Kernel extends HttpKernel // MUST have 2fa // MUST be confirmed. // (this group includes the other Firefly middleware) - 'user-full-auth' => [ + 'user-full-auth' => [ Sandstorm::class, EncryptCookies::class, AddQueuedCookiesToResponse::class, - StartSession::class, + StartFireflySession::class, ShareErrorsFromSession::class, VerifyCsrfToken::class, SubstituteBindings::class, @@ -153,11 +152,11 @@ class Kernel extends HttpKernel // MUST be confirmed. // MUST have owner role // (this group includes the other Firefly middleware) - 'admin' => [ + 'admin' => [ Sandstorm::class, EncryptCookies::class, AddQueuedCookiesToResponse::class, - StartSession::class, + StartFireflySession::class, ShareErrorsFromSession::class, VerifyCsrfToken::class, SubstituteBindings::class, diff --git a/app/Http/Middleware/StartFireflySession.php b/app/Http/Middleware/StartFireflySession.php new file mode 100644 index 0000000000..121491118d --- /dev/null +++ b/app/Http/Middleware/StartFireflySession.php @@ -0,0 +1,55 @@ +fullUrl(); + if ($request->method() === 'GET' && $request->route() && !$request->ajax()) { + if (strpos($fullUrl, '/javascript/') === false) { + $session->setPreviousUrl($fullUrl); + } + } + } + +} \ No newline at end of file diff --git a/app/Providers/FireflySessionProvider.php b/app/Providers/FireflySessionProvider.php new file mode 100644 index 0000000000..77eb25f0da --- /dev/null +++ b/app/Providers/FireflySessionProvider.php @@ -0,0 +1,64 @@ +registerSessionManager(); + + $this->registerSessionDriver(); + + $this->app->singleton(StartFireflySession::class); + } + + /** + * Register the session driver instance. + * + * @return void + */ + protected function registerSessionDriver() + { + $this->app->singleton( + 'session.store', function ($app) { + // First, we will create the session manager which is responsible for the + // creation of the various session drivers when they are needed by the + // application instance, and will resolve them on a lazy load basis. + return $app->make('session')->driver(); + } + ); + } + + /** + * Register the session manager instance. + * + * @return void + */ + protected function registerSessionManager() + { + $this->app->singleton( + 'session', function ($app) { + return new SessionManager($app); + } + ); + } +} \ No newline at end of file diff --git a/config/app.php b/config/app.php index a990e181f9..f92541fb61 100644 --- a/config/app.php +++ b/config/app.php @@ -46,7 +46,7 @@ return [ Illuminate\Queue\QueueServiceProvider::class, Illuminate\Redis\RedisServiceProvider::class, Illuminate\Auth\Passwords\PasswordResetServiceProvider::class, - Illuminate\Session\SessionServiceProvider::class, + FireflyIII\Providers\FireflySessionProvider::class, Illuminate\Translation\TranslationServiceProvider::class, Illuminate\Validation\ValidationServiceProvider::class, Illuminate\View\ViewServiceProvider::class, diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index d54d34d4a6..5bc5ae351d 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -959,4 +959,7 @@ return [ 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', + + // sandstorm.io errors and messages: + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; diff --git a/resources/views/error.twig b/resources/views/error.twig index 6d5f52c6ab..a41611d4f3 100644 --- a/resources/views/error.twig +++ b/resources/views/error.twig @@ -10,7 +10,12 @@
                                                                                                                                                                                                                                                                                                                                                                                    - {{ message |default('General unknown errror') }} +

                                                                                                                                                                                                                                                                                                                                                                                    {{ message |default('General unknown errror') }}

                                                                                                                                                                                                                                                                                                                                                                                    +
                                                                                                                                                                                                                                                                                                                                                                                    +
                                                                                                                                                                                                                                                                                                                                                                                    +
                                                                                                                                                                                                                                                                                                                                                                                    +
                                                                                                                                                                                                                                                                                                                                                                                    +

                                                                                                                                                                                                                                                                                                                                                                                    Follow this link back to the index.

                                                                                                                                                                                                                                                                                                                                                                                    {% endblock %} diff --git a/resources/views/partials/menu-sidebar.twig b/resources/views/partials/menu-sidebar.twig index c5c6210177..de3c48c507 100644 --- a/resources/views/partials/menu-sidebar.twig +++ b/resources/views/partials/menu-sidebar.twig @@ -148,10 +148,11 @@
                                                                                                                                                                                                                                                                                                                                                                                      - {% if not SANDSTORM %} +
                                                                                                                                                                                                                                                                                                                                                                                    • {{ 'profile'|_ }}
                                                                                                                                                                                                                                                                                                                                                                                      • + {% if not SANDSTORM %} {% endif %}
                                                                                                                                                                                                                                                                                                                                                                                    • {{ 'preferences'|_ }} @@ -173,7 +174,6 @@ - {% if not SANDSTORM %}
                                                                                                                                                                                                                                                                                                                                                                                    • diff --git a/test.sh b/test.sh index a88423359e..fbd2ec4b1e 100755 --- a/test.sh +++ b/test.sh @@ -51,9 +51,6 @@ fi # enable testing config cp $TESTINGENV $ORIGINALENV -# clear cache: -php artisan cache:clear - # reset database (optional) if [[ $resetTestFlag == "true" ]] then @@ -85,6 +82,13 @@ echo "Copy test database over original" # take database from copy: cp $DATABASECOPY $DATABASE +echo "clear caches and what-not.." +php artisan cache:clear +php artisan config:clear +php artisan route:clear +php artisan twig:clean +php artisan view:clear + # run PHPUnit if [[ $testflag == "" ]] then From 1feae802c20388e911aadad31a03d2d4bff3258f Mon Sep 17 00:00:00 2001 From: Patrick Kostjens Date: Sun, 12 Feb 2017 17:30:24 +0100 Subject: [PATCH 086/276] Use local folders in containers created by docker-compose to persist data --- .gitignore | 1 + docker-compose.yml | 15 ++++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 6b366227eb..b51e4c7d5f 100755 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ /public/storage /vendor /.idea +/firefly-db-storage Homestead.json Homestead.yaml .env diff --git a/docker-compose.yml b/docker-compose.yml index a7c42b18a0..2fcb6faac8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,25 +9,22 @@ services: - MYSQL_PASSWORD=firefly_db_secret - MYSQL_RANDOM_ROOT_PASSWORD=yes volumes: - - firefly-storage:/var/lib/mysql + - ./firefly-db-storage:/var/lib/mysql firefly-app: image: firefly-iii - build: - context: . + container_name: firefly-iii + build: . environment: - - INIT_DATABASE=yes - FF_DB_HOST=firefly-db - FF_DB_NAME=firefly_db - FF_DB_USER=firefly_db - FF_DB_PASSWORD=firefly_db_secret - FF_APP_KEY=SomeRandomStringOf32CharsExactly - - FF_APP_ENV=development + - FF_APP_ENV=production ports: - "80:80" links: - firefly-db - -volumes: - firefly-storage: - driver: local + volumes: + - ./storage:/var/www/firefly-iii/storage From adb0717ade965fc6043cbf2ef7ad420868ecbe5a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 17:50:50 +0100 Subject: [PATCH 087/276] New translations --- resources/lang/pt_BR/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index 6d270fdea5..12f18175b6 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -959,4 +959,7 @@ return [ 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', + + // sandstorm.io errors and messages: + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From 643655a612b470b6d1a9c2b15d23be255ba48616 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 17:50:54 +0100 Subject: [PATCH 088/276] New translations --- resources/lang/pl_PL/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php index d101e6129f..ff44553b96 100644 --- a/resources/lang/pl_PL/firefly.php +++ b/resources/lang/pl_PL/firefly.php @@ -959,4 +959,7 @@ return [ 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', + + // sandstorm.io errors and messages: + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From 79fcd874f76e6345ffabe03c88126d852b29da12 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 17:51:00 +0100 Subject: [PATCH 089/276] New translations --- resources/lang/de_DE/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index e0198d089f..78ec1ae556 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -960,4 +960,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', + + // sandstorm.io errors and messages: + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From 4459d09a90e966a341ac2b728315c0919750f470 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 17:51:10 +0100 Subject: [PATCH 090/276] New translations --- resources/lang/es_ES/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index a91170cd53..d12ae69331 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -959,4 +959,7 @@ return [ 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', + + // sandstorm.io errors and messages: + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From 5a2f48f529f40c623389787b37889167d4cf126d Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 17:51:16 +0100 Subject: [PATCH 091/276] Approved. Step name: Proofread --- resources/lang/nl_NL/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index e865beafce..5dcca84c28 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -959,4 +959,7 @@ return [ 'import_finished_intro' => 'De import is klaar! Je kan de transacties nu terugvinden in Firefly.', 'import_finished_text_without_link' => 'Er is geen tag die al je transacties bevat. Kijk links in het menu onder "Transacties" en zoek daar je nieuwe transacties op.', 'import_finished_text_with_link' => 'Je kan je geïmporteerde transacties op deze pagina terug vinden.', + + // sandstorm.io errors and messages: + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From fe2efd88cfca7388445ad3752d094771465eb792 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 17:51:21 +0100 Subject: [PATCH 092/276] New translations --- resources/lang/ru_RU/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php index a91170cd53..d12ae69331 100644 --- a/resources/lang/ru_RU/firefly.php +++ b/resources/lang/ru_RU/firefly.php @@ -959,4 +959,7 @@ return [ 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', + + // sandstorm.io errors and messages: + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From c37d772759e3595f653a4fc8adc498573aa7f6a8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 17:51:32 +0100 Subject: [PATCH 093/276] New translations --- resources/lang/zh_HK/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php index a91170cd53..d12ae69331 100644 --- a/resources/lang/zh_HK/firefly.php +++ b/resources/lang/zh_HK/firefly.php @@ -959,4 +959,7 @@ return [ 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', + + // sandstorm.io errors and messages: + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From 5fc1e6ad64d64b790ee8ea3c1c36d7af2136c7b2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 17:51:37 +0100 Subject: [PATCH 094/276] New translations --- resources/lang/hr_HR/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php index a91170cd53..d12ae69331 100644 --- a/resources/lang/hr_HR/firefly.php +++ b/resources/lang/hr_HR/firefly.php @@ -959,4 +959,7 @@ return [ 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', + + // sandstorm.io errors and messages: + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From d6f4bbf4bc6d1ae1a0391460e77405bd6844bcaa Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 17:51:44 +0100 Subject: [PATCH 095/276] New translations --- resources/lang/zh_TW/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index 9fddfcf9d8..6302fbb8a7 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -959,4 +959,7 @@ return [ 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', + + // sandstorm.io errors and messages: + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From de0371dd1cbeb9ca51b8622eb91979b419145960 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 17:51:53 +0100 Subject: [PATCH 096/276] New translations --- resources/lang/fr_FR/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index cfd9123263..d82f7d3160 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -959,4 +959,7 @@ return [ 'import_finished_intro' => 'The import has finished! You can now see the new transactions in Firefly.', 'import_finished_text_without_link' => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', + + // sandstorm.io errors and messages: + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From ff1d1e5b8f6a8f3ac6c1e158927045b795dd7b10 Mon Sep 17 00:00:00 2001 From: Patrick Kostjens Date: Sun, 12 Feb 2017 17:55:56 +0100 Subject: [PATCH 097/276] Revert docker-compose to development version and create separate production file --- docker-compose.prod.yml | 30 ++++++++++++++++++++++++++++++ docker-compose.yml | 15 +++++++++------ 2 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 docker-compose.prod.yml diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml new file mode 100644 index 0000000000..2fcb6faac8 --- /dev/null +++ b/docker-compose.prod.yml @@ -0,0 +1,30 @@ +version: '2' + +services: + firefly-db: + image: mysql:8 + environment: + - MYSQL_DATABASE=firefly_db + - MYSQL_USER=firefly_db + - MYSQL_PASSWORD=firefly_db_secret + - MYSQL_RANDOM_ROOT_PASSWORD=yes + volumes: + - ./firefly-db-storage:/var/lib/mysql + + firefly-app: + image: firefly-iii + container_name: firefly-iii + build: . + environment: + - FF_DB_HOST=firefly-db + - FF_DB_NAME=firefly_db + - FF_DB_USER=firefly_db + - FF_DB_PASSWORD=firefly_db_secret + - FF_APP_KEY=SomeRandomStringOf32CharsExactly + - FF_APP_ENV=production + ports: + - "80:80" + links: + - firefly-db + volumes: + - ./storage:/var/www/firefly-iii/storage diff --git a/docker-compose.yml b/docker-compose.yml index 2fcb6faac8..a7c42b18a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,22 +9,25 @@ services: - MYSQL_PASSWORD=firefly_db_secret - MYSQL_RANDOM_ROOT_PASSWORD=yes volumes: - - ./firefly-db-storage:/var/lib/mysql + - firefly-storage:/var/lib/mysql firefly-app: image: firefly-iii - container_name: firefly-iii - build: . + build: + context: . environment: + - INIT_DATABASE=yes - FF_DB_HOST=firefly-db - FF_DB_NAME=firefly_db - FF_DB_USER=firefly_db - FF_DB_PASSWORD=firefly_db_secret - FF_APP_KEY=SomeRandomStringOf32CharsExactly - - FF_APP_ENV=production + - FF_APP_ENV=development ports: - "80:80" links: - firefly-db - volumes: - - ./storage:/var/www/firefly-iii/storage + +volumes: + firefly-storage: + driver: local From 2c3682062213eea245e71a6eb4ae6196d004f685 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 17:58:16 +0100 Subject: [PATCH 098/276] New tests --- .sandstorm/launcher.sh | 2 +- .sandstorm/sandstorm-files.list | 134 +++++++++++++++-- app/Http/Controllers/ProfileController.php | 16 ++ resources/views/partials/menu-sidebar.twig | 3 +- .../Auth/TwoFactorControllerTest.php | 57 +++++++ .../Chart/AccountControllerTest.php | 141 ++++++++++++++++++ .../Controllers/Chart/BillControllerTest.php | 44 ++++++ .../Chart/BudgetControllerTest.php | 91 +++++++++++ .../Chart/CategoryControllerTest.php | 137 +++++++++++++++++ .../Chart/CategoryReportControllerTest.php | 70 +++++++++ .../Chart/PiggyBankControllerTest.php | 30 ++++ .../Chart/ReportControllerTest.php | 50 +++++++ 12 files changed, 761 insertions(+), 14 deletions(-) create mode 100644 tests/Feature/Controllers/Auth/TwoFactorControllerTest.php create mode 100644 tests/Feature/Controllers/Chart/AccountControllerTest.php create mode 100644 tests/Feature/Controllers/Chart/BillControllerTest.php create mode 100644 tests/Feature/Controllers/Chart/BudgetControllerTest.php create mode 100644 tests/Feature/Controllers/Chart/CategoryControllerTest.php create mode 100644 tests/Feature/Controllers/Chart/CategoryReportControllerTest.php create mode 100644 tests/Feature/Controllers/Chart/PiggyBankControllerTest.php create mode 100644 tests/Feature/Controllers/Chart/ReportControllerTest.php diff --git a/.sandstorm/launcher.sh b/.sandstorm/launcher.sh index 790f4e9711..f6fb9c13bc 100755 --- a/.sandstorm/launcher.sh +++ b/.sandstorm/launcher.sh @@ -55,7 +55,7 @@ echo "CREATE DATABASE IF NOT EXISTS firefly; GRANT ALL on firefly.* TO 'firefly' echo "Done!" echo "Migrating..." -php /opt/app/artisan migrate:refresh --seed --force +php /opt/app/artisan migrate --seed --force echo "Done!" # Start nginx. diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list index 7d8d51d516..91b1256d53 100644 --- a/.sandstorm/sandstorm-files.list +++ b/.sandstorm/sandstorm-files.list @@ -232,8 +232,14 @@ opt/app/app/Console/Kernel.php opt/app/app/Exceptions/Handler.php opt/app/app/Generator/Chart/Basic/ChartJsGenerator.php opt/app/app/Generator/Chart/Basic/GeneratorInterface.php +opt/app/app/Helpers/Attachments/AttachmentHelper.php +opt/app/app/Helpers/Attachments/AttachmentHelperInterface.php opt/app/app/Helpers/Collector/JournalCollector.php opt/app/app/Helpers/Collector/JournalCollectorInterface.php +opt/app/app/Helpers/FiscalHelper.php +opt/app/app/Helpers/FiscalHelperInterface.php +opt/app/app/Helpers/Report/ReportHelper.php +opt/app/app/Helpers/Report/ReportHelperInterface.php opt/app/app/Http/Controllers/Auth/LoginController.php opt/app/app/Http/Controllers/BudgetController.php opt/app/app/Http/Controllers/Chart/AccountController.php @@ -245,6 +251,8 @@ opt/app/app/Http/Controllers/JavascriptController.php opt/app/app/Http/Controllers/JsonController.php opt/app/app/Http/Controllers/NewUserController.php opt/app/app/Http/Controllers/ProfileController.php +opt/app/app/Http/Controllers/ReportController.php +opt/app/app/Http/Controllers/Transaction/SingleController.php opt/app/app/Http/Kernel.php opt/app/app/Http/Middleware/Authenticate.php opt/app/app/Http/Middleware/AuthenticateTwoFactor.php @@ -253,8 +261,11 @@ opt/app/app/Http/Middleware/EncryptCookies.php opt/app/app/Http/Middleware/Range.php opt/app/app/Http/Middleware/RedirectIfAuthenticated.php opt/app/app/Http/Middleware/Sandstorm.php +opt/app/app/Http/Middleware/StartFireflySession.php opt/app/app/Http/Middleware/VerifyCsrfToken.php +opt/app/app/Http/Requests/JournalFormRequest.php opt/app/app/Http/Requests/NewUserFormRequest.php +opt/app/app/Http/Requests/ProfileFormRequest.php opt/app/app/Http/Requests/Request.php opt/app/app/Http/breadcrumbs.php opt/app/app/Jobs/Job.php @@ -283,12 +294,13 @@ opt/app/app/Providers/AuthServiceProvider.php opt/app/app/Providers/BillServiceProvider.php opt/app/app/Providers/BudgetServiceProvider.php opt/app/app/Providers/CategoryServiceProvider.php -opt/app/app/Providers/CrudServiceProvider.php opt/app/app/Providers/CurrencyServiceProvider.php opt/app/app/Providers/EventServiceProvider.php opt/app/app/Providers/ExportJobServiceProvider.php opt/app/app/Providers/FireflyServiceProvider.php +opt/app/app/Providers/FireflySessionProvider.php opt/app/app/Providers/JournalServiceProvider.php +opt/app/app/Providers/LogServiceProvider.php opt/app/app/Providers/PiggyBankServiceProvider.php opt/app/app/Providers/RouteServiceProvider.php opt/app/app/Providers/RuleGroupServiceProvider.php @@ -307,6 +319,11 @@ opt/app/app/Repositories/Category/CategoryRepository.php opt/app/app/Repositories/Category/CategoryRepositoryInterface.php opt/app/app/Repositories/Journal/JournalRepository.php opt/app/app/Repositories/Journal/JournalRepositoryInterface.php +opt/app/app/Repositories/PiggyBank/PiggyBankRepository.php +opt/app/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php +opt/app/app/Repositories/Tag/TagRepository.php +opt/app/app/Repositories/Tag/TagRepositoryInterface.php +opt/app/app/Repositories/User/UserRepositoryInterface.php opt/app/app/Support/Amount.php opt/app/app/Support/CacheProperties.php opt/app/app/Support/Domain.php @@ -368,9 +385,13 @@ opt/app/database/seeds/DatabaseSeeder.php opt/app/database/seeds/PermissionSeeder.php opt/app/database/seeds/TransactionCurrencySeeder.php opt/app/database/seeds/TransactionTypeSeeder.php +opt/app/public/css/bootstrap-multiselect.css +opt/app/public/css/bootstrap-tagsinput.css opt/app/public/css/bootstrap-tour.min.css opt/app/public/css/daterangepicker.css opt/app/public/css/firefly.css +opt/app/public/css/jquery-ui/jquery-ui.structure.min.css +opt/app/public/css/jquery-ui/jquery-ui.theme.min.css opt/app/public/index.php opt/app/public/js/ff/budgets/index.js opt/app/public/js/ff/charts.defaults.js @@ -379,11 +400,18 @@ opt/app/public/js/ff/firefly.js opt/app/public/js/ff/guest.js opt/app/public/js/ff/help.js opt/app/public/js/ff/index.js +opt/app/public/js/ff/reports/index.js +opt/app/public/js/ff/transactions/single/create.js opt/app/public/js/lib/Chart.bundle.min.js opt/app/public/js/lib/accounting.min.js +opt/app/public/js/lib/bootstrap-multiselect.js +opt/app/public/js/lib/bootstrap-tagsinput.min.js opt/app/public/js/lib/bootstrap-tour.min.js +opt/app/public/js/lib/bootstrap3-typeahead.min.js opt/app/public/js/lib/daterangepicker.js opt/app/public/js/lib/jquery-3.1.1.min.js +opt/app/public/js/lib/jquery-ui.min.js +opt/app/public/js/lib/modernizr-custom.js opt/app/public/js/lib/moment.min.js opt/app/public/lib/adminlte/css/AdminLTE.min.css opt/app/public/lib/adminlte/css/skins/skin-blue-light.min.css @@ -406,9 +434,14 @@ opt/app/resources/views/emails/footer-html.twig opt/app/resources/views/emails/footer-text.twig opt/app/resources/views/emails/header-html.twig opt/app/resources/views/emails/header-text.twig +opt/app/resources/views/error.twig +opt/app/resources/views/form/amount.twig opt/app/resources/views/form/balance.twig +opt/app/resources/views/form/date.twig opt/app/resources/views/form/feedback.twig opt/app/resources/views/form/help.twig +opt/app/resources/views/form/options.twig +opt/app/resources/views/form/select.twig opt/app/resources/views/form/text.twig opt/app/resources/views/index.twig opt/app/resources/views/javascript/variables.twig @@ -423,7 +456,12 @@ opt/app/resources/views/partials/favicons.twig opt/app/resources/views/partials/flashes.twig opt/app/resources/views/partials/menu-sidebar.twig opt/app/resources/views/partials/page-header.twig +opt/app/resources/views/profile/change-password.twig +opt/app/resources/views/profile/delete-account.twig opt/app/resources/views/profile/index.twig +opt/app/resources/views/reports/index.twig +opt/app/resources/views/reports/options/no-options.twig +opt/app/resources/views/transactions/single/create.twig opt/app/routes/api.php opt/app/routes/console.php opt/app/routes/web.php @@ -517,6 +555,8 @@ opt/app/vendor/laravel/framework/src/Illuminate/Cache/CacheManager.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/Console/CacheTableCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/Console/ClearCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Cache/Console/ForgetCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Cache/Events/CacheEvent.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/Events/CacheHit.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/Events/CacheMissed.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/Events/KeyForgotten.php @@ -525,17 +565,18 @@ opt/app/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/Repository.php opt/app/vendor/laravel/framework/src/Illuminate/Cache/RetrievesMultipleKeys.php opt/app/vendor/laravel/framework/src/Illuminate/Config/Repository.php -opt/app/vendor/laravel/framework/src/Illuminate/Console/AppNamespaceDetectorTrait.php opt/app/vendor/laravel/framework/src/Illuminate/Console/Application.php opt/app/vendor/laravel/framework/src/Illuminate/Console/Command.php opt/app/vendor/laravel/framework/src/Illuminate/Console/ConfirmableTrait.php +opt/app/vendor/laravel/framework/src/Illuminate/Console/DetectsApplicationNamespace.php opt/app/vendor/laravel/framework/src/Illuminate/Console/Events/ArtisanStarting.php opt/app/vendor/laravel/framework/src/Illuminate/Console/GeneratorCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Console/OutputStyle.php opt/app/vendor/laravel/framework/src/Illuminate/Console/Parser.php -opt/app/vendor/laravel/framework/src/Illuminate/Console/ScheduleServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Schedule.php +opt/app/vendor/laravel/framework/src/Illuminate/Console/Scheduling/ScheduleFinishCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Console/Scheduling/ScheduleRunCommand.php +opt/app/vendor/laravel/framework/src/Illuminate/Container/BoundMethod.php opt/app/vendor/laravel/framework/src/Illuminate/Container/Container.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Access/Authorizable.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Access/Gate.php @@ -561,7 +602,10 @@ opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Debug/ExceptionHandler opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Encryption/DecryptException.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Encryption/Encrypter.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Events/Dispatcher.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Filesystem/Cloud.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Filesystem/Factory.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Filesystem/FileNotFoundException.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Filesystem/Filesystem.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Foundation/Application.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Hashing/Hasher.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Http/Kernel.php @@ -577,16 +621,19 @@ opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/Queue.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/QueueableCollection.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/QueueableEntity.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/ShouldQueue.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Routing/BindingRegistrar.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Routing/Registrar.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Routing/ResponseFactory.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Routing/UrlGenerator.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Routing/UrlRoutable.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Session/Session.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Support/Arrayable.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Support/Htmlable.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Support/Jsonable.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Support/MessageBag.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Support/MessageProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Support/Renderable.php +opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Translation/Translator.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Validation/Factory.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Validation/ValidatesWhenResolved.php opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Validation/Validator.php @@ -596,6 +643,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php opt/app/vendor/laravel/framework/src/Illuminate/Cookie/CookieServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/AddQueuedCookiesToResponse.php opt/app/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Concerns/ManagesTransactions.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Connection.php opt/app/vendor/laravel/framework/src/Illuminate/Database/ConnectionInterface.php opt/app/vendor/laravel/framework/src/Illuminate/Database/ConnectionResolverInterface.php @@ -619,16 +667,27 @@ opt/app/vendor/laravel/framework/src/Illuminate/Database/DetectsDeadlocks.php opt/app/vendor/laravel/framework/src/Illuminate/Database/DetectsLostConnections.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/GuardsAttributes.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasEvents.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasGlobalScopes.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasTimestamps.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HidesAttributes.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/InteractsWithPivotTable.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasMany.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Relation.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Scope.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletes.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletingScope.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Events/QueryExecuted.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Events/StatementPrepared.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Grammar.php opt/app/vendor/laravel/framework/src/Illuminate/Database/MigrationServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Migrations/DatabaseMigrationRepository.php @@ -647,16 +706,19 @@ opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/Proces opt/app/vendor/laravel/framework/src/Illuminate/Database/QueryException.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Schema/Blueprint.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Schema/Builder.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/ChangeColumn.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/Grammar.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php +opt/app/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/RenameColumn.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Schema/MySqlBuilder.php -opt/app/vendor/laravel/framework/src/Illuminate/Database/SeedServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Database/Seeder.php opt/app/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php opt/app/vendor/laravel/framework/src/Illuminate/Encryption/EncryptionServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Events/Dispatcher.php opt/app/vendor/laravel/framework/src/Illuminate/Events/EventServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php +opt/app/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemAdapter.php +opt/app/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemManager.php opt/app/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/AliasLoader.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Application.php @@ -667,10 +729,9 @@ opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Auth/RedirectsUsers.p opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ThrottlesLogins.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Auth/User.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/BootProviders.php -opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/ConfigureLogging.php -opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/DetectEnvironment.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/HandleExceptions.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadEnvironmentVariables.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/RegisterFacades.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/RegisterProviders.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/SetRequestForConsole.php @@ -701,12 +762,13 @@ opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteListComm opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/ServeCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/StorageLinkCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/TestMakeCommand.php -opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/TinkerCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/UpCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/VendorPublishCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Console/ViewClearCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/EnvironmentDetector.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Events/LocaleUpdated.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/Handler.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/Events/RequestHandled.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/FormRequest.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/CheckForMaintenanceMode.php @@ -715,6 +777,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Foundation/ProviderRepository.ph opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ComposerServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ConsoleSupportServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Providers/FormRequestServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Providers/FoundationServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/AuthServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/EventServiceProvider.php @@ -723,11 +786,16 @@ opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesR opt/app/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php opt/app/vendor/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php opt/app/vendor/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php +opt/app/vendor/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php +opt/app/vendor/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithFlashData.php +opt/app/vendor/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithInput.php opt/app/vendor/laravel/framework/src/Illuminate/Http/JsonResponse.php opt/app/vendor/laravel/framework/src/Illuminate/Http/RedirectResponse.php opt/app/vendor/laravel/framework/src/Illuminate/Http/Request.php opt/app/vendor/laravel/framework/src/Illuminate/Http/Response.php opt/app/vendor/laravel/framework/src/Illuminate/Http/ResponseTrait.php +opt/app/vendor/laravel/framework/src/Illuminate/Log/Events/MessageLogged.php +opt/app/vendor/laravel/framework/src/Illuminate/Log/LogServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Log/Writer.php opt/app/vendor/laravel/framework/src/Illuminate/Mail/Events/MessageSending.php opt/app/vendor/laravel/framework/src/Illuminate/Mail/MailServiceProvider.php @@ -756,7 +824,6 @@ opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/RestartCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/RetryCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/TableCommand.php opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/WorkCommand.php -opt/app/vendor/laravel/framework/src/Illuminate/Queue/ConsoleServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Queue/Events/JobProcessed.php opt/app/vendor/laravel/framework/src/Illuminate/Queue/Events/JobProcessing.php opt/app/vendor/laravel/framework/src/Illuminate/Queue/InteractsWithQueue.php @@ -777,18 +844,26 @@ opt/app/vendor/laravel/framework/src/Illuminate/Routing/Controller.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/ControllerMiddlewareOptions.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Events/RouteMatched.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/ImplicitRouteBinding.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Matching/HostValidator.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Matching/MethodValidator.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Matching/SchemeValidator.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Matching/UriValidator.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Matching/ValidatorInterface.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Middleware/SubstituteBindings.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/MiddlewareNameResolver.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Redirector.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/ResponseFactory.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Route.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/RouteAction.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/RouteCollection.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/RouteCompiler.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/RouteDependencyResolverTrait.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/RouteGroup.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/RouteParameterBinder.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/RouteSignatureParameters.php +opt/app/vendor/laravel/framework/src/Illuminate/Routing/RouteUrlGenerator.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/Router.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/RoutingServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Routing/SortedMiddleware.php @@ -797,7 +872,6 @@ opt/app/vendor/laravel/framework/src/Illuminate/Session/Console/SessionTableComm opt/app/vendor/laravel/framework/src/Illuminate/Session/EncryptedStore.php opt/app/vendor/laravel/framework/src/Illuminate/Session/FileSessionHandler.php opt/app/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php -opt/app/vendor/laravel/framework/src/Illuminate/Session/SessionInterface.php opt/app/vendor/laravel/framework/src/Illuminate/Session/SessionManager.php opt/app/vendor/laravel/framework/src/Illuminate/Session/SessionServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Session/Store.php @@ -823,6 +897,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Response.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Route.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Schema.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Session.php +opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Storage.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/URL.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Validator.php opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/View.php @@ -841,16 +916,38 @@ opt/app/vendor/laravel/framework/src/Illuminate/Translation/FileLoader.php opt/app/vendor/laravel/framework/src/Illuminate/Translation/LoaderInterface.php opt/app/vendor/laravel/framework/src/Illuminate/Translation/TranslationServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Translation/Translator.php +opt/app/vendor/laravel/framework/src/Illuminate/Validation/Concerns/FormatsMessages.php +opt/app/vendor/laravel/framework/src/Illuminate/Validation/Concerns/ReplacesAttributes.php +opt/app/vendor/laravel/framework/src/Illuminate/Validation/Concerns/ValidatesAttributes.php opt/app/vendor/laravel/framework/src/Illuminate/Validation/DatabasePresenceVerifier.php opt/app/vendor/laravel/framework/src/Illuminate/Validation/Factory.php opt/app/vendor/laravel/framework/src/Illuminate/Validation/PresenceVerifierInterface.php opt/app/vendor/laravel/framework/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php opt/app/vendor/laravel/framework/src/Illuminate/Validation/ValidationException.php +opt/app/vendor/laravel/framework/src/Illuminate/Validation/ValidationRuleParser.php opt/app/vendor/laravel/framework/src/Illuminate/Validation/ValidationServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Validation/Validator.php opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/BladeCompiler.php opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Compiler.php opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/CompilerInterface.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesAuthorizations.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesComments.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesComponents.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesConditionals.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesEchos.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesIncludes.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesInjections.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesLayouts.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesLoops.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesRawPhp.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesStacks.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesTranslations.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesComponents.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesEvents.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesLayouts.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesLoops.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesStacks.php +opt/app/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesTranslations.php opt/app/vendor/laravel/framework/src/Illuminate/View/Engines/CompilerEngine.php opt/app/vendor/laravel/framework/src/Illuminate/View/Engines/EngineInterface.php opt/app/vendor/laravel/framework/src/Illuminate/View/Engines/EngineResolver.php @@ -860,6 +957,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php opt/app/vendor/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromSession.php opt/app/vendor/laravel/framework/src/Illuminate/View/View.php opt/app/vendor/laravel/framework/src/Illuminate/View/ViewFinderInterface.php +opt/app/vendor/laravel/framework/src/Illuminate/View/ViewName.php opt/app/vendor/laravel/framework/src/Illuminate/View/ViewServiceProvider.php opt/app/vendor/laravelcollective/html/src/Componentable.php opt/app/vendor/laravelcollective/html/src/FormBuilder.php @@ -867,6 +965,15 @@ opt/app/vendor/laravelcollective/html/src/FormFacade.php opt/app/vendor/laravelcollective/html/src/HtmlBuilder.php opt/app/vendor/laravelcollective/html/src/HtmlServiceProvider.php opt/app/vendor/laravelcollective/html/src/helpers.php +opt/app/vendor/league/flysystem/src/Adapter/AbstractAdapter.php +opt/app/vendor/league/flysystem/src/Adapter/Local.php +opt/app/vendor/league/flysystem/src/AdapterInterface.php +opt/app/vendor/league/flysystem/src/Config.php +opt/app/vendor/league/flysystem/src/ConfigAwareTrait.php +opt/app/vendor/league/flysystem/src/Filesystem.php +opt/app/vendor/league/flysystem/src/FilesystemInterface.php +opt/app/vendor/league/flysystem/src/Plugin/PluggableTrait.php +opt/app/vendor/league/flysystem/src/ReadInterface.php opt/app/vendor/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php opt/app/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php opt/app/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php @@ -883,7 +990,6 @@ opt/app/vendor/nesbot/carbon/src/Carbon/Lang/en.php opt/app/vendor/paragonie/random_compat/lib/random.php opt/app/vendor/pragmarx/google2fa/src/Vendor/Laravel/ServiceProvider.php opt/app/vendor/psr/log/Psr/Log/LoggerInterface.php -opt/app/vendor/psy/psysh/src/Psy/functions.php opt/app/vendor/rcrowe/twigbridge/config/twigbridge.php opt/app/vendor/rcrowe/twigbridge/src/Bridge.php opt/app/vendor/rcrowe/twigbridge/src/Command/Clean.php @@ -1015,6 +1121,7 @@ opt/app/vendor/symfony/console/Input/InputArgument.php opt/app/vendor/symfony/console/Input/InputDefinition.php opt/app/vendor/symfony/console/Input/InputInterface.php opt/app/vendor/symfony/console/Input/InputOption.php +opt/app/vendor/symfony/console/Input/StreamableInputInterface.php opt/app/vendor/symfony/console/Output/BufferedOutput.php opt/app/vendor/symfony/console/Output/ConsoleOutput.php opt/app/vendor/symfony/console/Output/ConsoleOutputInterface.php @@ -1024,7 +1131,9 @@ opt/app/vendor/symfony/console/Output/StreamOutput.php opt/app/vendor/symfony/console/Style/OutputStyle.php opt/app/vendor/symfony/console/Style/StyleInterface.php opt/app/vendor/symfony/console/Style/SymfonyStyle.php +opt/app/vendor/symfony/console/Terminal.php opt/app/vendor/symfony/debug/Exception/FatalErrorException.php +opt/app/vendor/symfony/debug/Exception/FatalThrowableError.php opt/app/vendor/symfony/debug/Exception/FlattenException.php opt/app/vendor/symfony/debug/ExceptionHandler.php opt/app/vendor/symfony/finder/Comparator/Comparator.php @@ -1112,13 +1221,17 @@ opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Call.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Function.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Name.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Test.php +opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php @@ -1130,7 +1243,6 @@ opt/app/vendor/twig/twig/lib/Twig/Node/Module.php opt/app/vendor/twig/twig/lib/Twig/Node/Print.php opt/app/vendor/twig/twig/lib/Twig/Node/Set.php opt/app/vendor/twig/twig/lib/Twig/Node/Text.php -opt/app/vendor/twig/twig/lib/Twig/NodeCaptureInterface.php opt/app/vendor/twig/twig/lib/Twig/NodeInterface.php opt/app/vendor/twig/twig/lib/Twig/NodeOutputInterface.php opt/app/vendor/twig/twig/lib/Twig/NodeTraverser.php diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index aebec981cb..e2f7516dd8 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -52,6 +52,10 @@ class ProfileController extends Controller */ public function changePassword() { + if (intval(getenv('SANDSTORM')) === 1) { + return view('error')->with('message', strval(trans('firefly.sandstorm_not_available'))); + } + if (auth()->user()->hasRole('demo')) { Session::flash('info', strval(trans('firefly.cannot_change_demo'))); @@ -70,6 +74,10 @@ class ProfileController extends Controller */ public function deleteAccount() { + if (intval(getenv('SANDSTORM')) === 1) { + return view('error')->with('message', strval(trans('firefly.sandstorm_not_available'))); + } + if (auth()->user()->hasRole('demo')) { Session::flash('info', strval(trans('firefly.cannot_delete_demo'))); @@ -103,6 +111,10 @@ class ProfileController extends Controller */ public function postChangePassword(ProfileFormRequest $request, UserRepositoryInterface $repository) { + if (intval(getenv('SANDSTORM')) === 1) { + return view('error')->with('message', strval(trans('firefly.sandstorm_not_available'))); + } + if (auth()->user()->hasRole('demo')) { Session::flash('info', strval(trans('firefly.cannot_change_demo'))); @@ -139,6 +151,10 @@ class ProfileController extends Controller */ public function postDeleteAccount(UserRepositoryInterface $repository, DeleteAccountFormRequest $request) { + if (intval(getenv('SANDSTORM')) === 1) { + return view('error')->with('message', strval(trans('firefly.sandstorm_not_available'))); + } + if (auth()->user()->hasRole('demo')) { Session::flash('info', strval(trans('firefly.cannot_delete_demo'))); diff --git a/resources/views/partials/menu-sidebar.twig b/resources/views/partials/menu-sidebar.twig index de3c48c507..c9fc3db022 100644 --- a/resources/views/partials/menu-sidebar.twig +++ b/resources/views/partials/menu-sidebar.twig @@ -148,11 +148,10 @@
                                                                                                                                                                                                                                                                                                                                                                                        - + {% if not SANDSTORM %}
                                                                                                                                                                                                                                                                                                                                                                                      • {{ 'profile'|_ }}
                                                                                                                                                                                                                                                                                                                                                                                        • - {% if not SANDSTORM %} {% endif %}
                                                                                                                                                                                                                                                                                                                                                                                      • {{ 'preferences'|_ }} diff --git a/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php b/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php new file mode 100644 index 0000000000..bfe699c963 --- /dev/null +++ b/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php @@ -0,0 +1,57 @@ +be($this->user()); + + $falsePreference = new Preference; + $falsePreference->data = true; + $secretPreference = new Preference; + $secretPreference->data = 'BlablaSeecret'; + Preferences::shouldReceive('get')->withArgs(['twoFactorAuthEnabled', false])->andReturn($falsePreference); + Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret', null])->andReturn($secretPreference); + Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret'])->andReturn($secretPreference); + $response = $this->get(route('two-factor.index')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Auth\TwoFactorController::lostTwoFactor + */ + public function testLostTwoFactor() + { + $this->be($this->user()); + + $truePreference = new Preference; + $truePreference->data = true; + $secretPreference = new Preference; + $secretPreference->data = 'BlablaSeecret'; + Preferences::shouldReceive('get')->withArgs(['twoFactorAuthEnabled', false])->andReturn($truePreference); + Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret', null])->andReturn($secretPreference); + Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret'])->andReturn($secretPreference); + $response = $this->get(route('two-factor.lost')); + $response->assertStatus(200); + } + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Chart/AccountControllerTest.php b/tests/Feature/Controllers/Chart/AccountControllerTest.php new file mode 100644 index 0000000000..d74b4989e3 --- /dev/null +++ b/tests/Feature/Controllers/Chart/AccountControllerTest.php @@ -0,0 +1,141 @@ +be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('chart.account.expense')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\AccountController::expenseBudget + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testExpenseBudget(string $range) + { + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('chart.account.expense-budget', [1, '20120101', '20120131'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\AccountController::expenseCategory + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testExpenseCategory(string $range) + { + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('chart.account.expense-category', [1, '20120101', '20120131'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\AccountController::frontpage + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testFrontpage(string $range) + { + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('chart.account.frontpage')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\AccountController::incomeCategory + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testIncomeCategory(string $range) + { + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('chart.account.income-category', [1, '20120101', '20120131'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\AccountController::period + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testPeriod(string $range) + { + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('chart.account.period', [1, '2012-01-01'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\AccountController::report + */ + public function testReport() + { + $this->be($this->user()); + $response = $this->get(route('chart.account.report', ['1', '20120101', '20120131'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\AccountController::revenueAccounts + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testRevenueAccounts(string $range) + { + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('chart.account.revenue')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\AccountController::single + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testSingle(string $range) + { + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('chart.account.single', [1])); + $response->assertStatus(200); + } + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Chart/BillControllerTest.php b/tests/Feature/Controllers/Chart/BillControllerTest.php new file mode 100644 index 0000000000..653f907b39 --- /dev/null +++ b/tests/Feature/Controllers/Chart/BillControllerTest.php @@ -0,0 +1,44 @@ +be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('chart.bill.frontpage')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\BillController::single + */ + public function testSingle() + { + $this->be($this->user()); + $response = $this->get(route('chart.bill.single', [1])); + $response->assertStatus(200); + } + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Chart/BudgetControllerTest.php b/tests/Feature/Controllers/Chart/BudgetControllerTest.php new file mode 100644 index 0000000000..3cc1c86cf5 --- /dev/null +++ b/tests/Feature/Controllers/Chart/BudgetControllerTest.php @@ -0,0 +1,91 @@ +mock(BudgetRepositoryInterface::class); + $budgetRepository->shouldReceive('firstUseDate')->andReturn(new Carbon('2015-01-01')); + $budgetRepository->shouldReceive('spentInPeriod')->andReturn('-100'); + + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('chart.budget.budget', [1])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::budgetLimit + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testBudgetLimit(string $range) + { + $budgetRepository = $this->mock(BudgetRepositoryInterface::class); + $budgetRepository->shouldReceive('spentInPeriod')->andReturn('-100'); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('chart.budget.budget-limit', [1,1])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::frontpage + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testFrontpage(string $range) + { + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('chart.budget.frontpage')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::period + */ + public function testPeriod() + { + $this->be($this->user()); + $response = $this->get(route('chart.budget.period', [1,'1','20120101','20120131'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::periodNoBudget + */ + public function testPeriodNoBudget() + { + $this->be($this->user()); + $response = $this->get(route('chart.budget.period.no-budget', ['1','20120101','20120131'])); + $response->assertStatus(200); + } + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Chart/CategoryControllerTest.php b/tests/Feature/Controllers/Chart/CategoryControllerTest.php new file mode 100644 index 0000000000..423ac609f9 --- /dev/null +++ b/tests/Feature/Controllers/Chart/CategoryControllerTest.php @@ -0,0 +1,137 @@ +mock(CategoryRepositoryInterface::class); + + $catRepository->shouldReceive('spentInPeriod')->andReturn('0'); + $catRepository->shouldReceive('earnedInPeriod')->andReturn('0'); + $catRepository->shouldReceive('firstUseDate')->andReturn(new Carbon); + + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('chart.category.all', [1])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::currentPeriod + * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::makePeriodChart + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testCurrentPeriod(string $range) + { + // this is actually for makePeriodChart + $accountRepository = $this->mock(AccountRepositoryInterface::class); + $categoryRepository = $this->mock(CategoryRepositoryInterface::class); + $account = $this->user()->accounts()->where('account_type_id', 5)->first(); + $accountRepository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])); + $categoryRepository->shouldReceive('spentInPeriod')->andReturn('0'); + $categoryRepository->shouldReceive('earnedInPeriod')->andReturn('0'); + + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('chart.category.current', [1])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::frontpage + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testFrontpage(string $range) + { + $accountRepository = $this->mock(AccountRepositoryInterface::class); + $categoryRepository = $this->mock(CategoryRepositoryInterface::class); + $category = $this->user()->categories()->first(); + $account = $this->user()->accounts()->where('account_type_id', 5)->first(); + // get one category + $categoryRepository->shouldReceive('getCategories')->andReturn(new Collection([$category])); + // get one account + $accountRepository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])); + // always return zero + $categoryRepository->shouldReceive('spentInPeriod')->andReturn('0'); + $categoryRepository->shouldReceive('spentInPeriodWithoutCategory')->andReturn('0'); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('chart.category.frontpage', [1])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::reportPeriod + */ + public function testReportPeriod() + { + $this->be($this->user()); + $response = $this->get(route('chart.category.period', [1, '1', '20120101', '20120131'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::reportPeriodNoCategory + */ + public function testReportPeriodNoCategory() + { + $this->be($this->user()); + $response = $this->get(route('chart.category.period.no-category', ['1', '20120101', '20120131'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::specificPeriod + * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::makePeriodChart + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testSpecificPeriod(string $range) + { + $accountRepository = $this->mock(AccountRepositoryInterface::class); + $categoryRepository = $this->mock(CategoryRepositoryInterface::class); + $account = $this->user()->accounts()->where('account_type_id', 5)->first(); + $accountRepository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])); + $categoryRepository->shouldReceive('spentInPeriod')->andReturn('0'); + $categoryRepository->shouldReceive('earnedInPeriod')->andReturn('0'); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('chart.category.specific', ['1', '2012-01-01'])); + $response->assertStatus(200); + } + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php b/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php new file mode 100644 index 0000000000..e89e0a9040 --- /dev/null +++ b/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php @@ -0,0 +1,70 @@ +be($this->user()); + $response = $this->get(route('chart.category.account-expense', ['1', '1', '20120101', '20120131', 0])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::accountIncome + */ + public function testAccountIncome() + { + $this->be($this->user()); + $response = $this->get(route('chart.category.account-income', ['1', '1', '20120101', '20120131', 0])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::categoryExpense + */ + public function testCategoryExpense() + { + $this->be($this->user()); + $response = $this->get(route('chart.category.category-expense', ['1', '1', '20120101', '20120131', 0])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::categoryIncome + */ + public function testCategoryIncome() + { + $this->be($this->user()); + $response = $this->get(route('chart.category.category-income', ['1', '1', '20120101', '20120131', 0])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::mainChart + */ + public function testMainChart() + { + $this->be($this->user()); + $response = $this->get(route('chart.category.main', ['1', '1', '20120101', '20120131'])); + $response->assertStatus(200); + } + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php b/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php new file mode 100644 index 0000000000..07156605fe --- /dev/null +++ b/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php @@ -0,0 +1,30 @@ +be($this->user()); + $response = $this->get(route('chart.piggy-bank.history', [1])); + $response->assertStatus(200); + } + + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Chart/ReportControllerTest.php b/tests/Feature/Controllers/Chart/ReportControllerTest.php new file mode 100644 index 0000000000..89c3149d2c --- /dev/null +++ b/tests/Feature/Controllers/Chart/ReportControllerTest.php @@ -0,0 +1,50 @@ +be($this->user()); + $response = $this->get(route('chart.report.net-worth', [1, '20120101', '20120131'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\ReportController::operations + */ + public function testOperations() + { + $this->be($this->user()); + $response = $this->get(route('chart.report.operations', [1, '20120101', '20120131'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Chart\ReportController::sum + */ + public function testSum() + { + $this->be($this->user()); + $response = $this->get(route('chart.report.sum', [1, '20120101', '20120131'])); + $response->assertStatus(200); + } + +} \ No newline at end of file From bd1672fd7b75f16692a55c2876811f6534de3e51 Mon Sep 17 00:00:00 2001 From: Patrick Kostjens Date: Sun, 12 Feb 2017 18:07:48 +0100 Subject: [PATCH 099/276] Use Docker volume for mysql data storage --- .gitignore | 1 - docker-compose.prod.yml | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b51e4c7d5f..6b366227eb 100755 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ /public/storage /vendor /.idea -/firefly-db-storage Homestead.json Homestead.yaml .env diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 2fcb6faac8..42944a9023 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -9,7 +9,7 @@ services: - MYSQL_PASSWORD=firefly_db_secret - MYSQL_RANDOM_ROOT_PASSWORD=yes volumes: - - ./firefly-db-storage:/var/lib/mysql + - firefly-db-storage:/var/lib/mysql firefly-app: image: firefly-iii @@ -28,3 +28,6 @@ services: - firefly-db volumes: - ./storage:/var/www/firefly-iii/storage +volumes: + firefly-db-storage: + driver: local From fd3f756640d24e3e2b2b5baaf3ef82ef15891127 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 18:40:39 +0100 Subject: [PATCH 100/276] Restored most pre-5.4 tests. --- .../Popup/ReportControllerTest.php | 143 ++++++++++++++++++ .../Report/AccountControllerTest.php | 29 ++++ .../Report/BalanceControllerTest.php | 29 ++++ .../Report/BudgetControllerTest.php | 39 +++++ .../Report/CategoryControllerTest.php | 49 ++++++ .../Report/OperationsControllerTest.php | 49 ++++++ .../Transaction/ConvertControllerTest.php | 115 ++++++++++++++ .../Transaction/MassControllerTest.php | 103 +++++++++++++ .../Transaction/SingleControllerTest.php | 135 +++++++++++++++++ .../Transaction/SplitControllerTest.php | 78 ++++++++++ 10 files changed, 769 insertions(+) create mode 100644 tests/Feature/Controllers/Popup/ReportControllerTest.php create mode 100644 tests/Feature/Controllers/Report/AccountControllerTest.php create mode 100644 tests/Feature/Controllers/Report/BalanceControllerTest.php create mode 100644 tests/Feature/Controllers/Report/BudgetControllerTest.php create mode 100644 tests/Feature/Controllers/Report/CategoryControllerTest.php create mode 100644 tests/Feature/Controllers/Report/OperationsControllerTest.php create mode 100644 tests/Feature/Controllers/Transaction/ConvertControllerTest.php create mode 100644 tests/Feature/Controllers/Transaction/MassControllerTest.php create mode 100644 tests/Feature/Controllers/Transaction/SingleControllerTest.php create mode 100644 tests/Feature/Controllers/Transaction/SplitControllerTest.php diff --git a/tests/Feature/Controllers/Popup/ReportControllerTest.php b/tests/Feature/Controllers/Popup/ReportControllerTest.php new file mode 100644 index 0000000000..97ba0c1bae --- /dev/null +++ b/tests/Feature/Controllers/Popup/ReportControllerTest.php @@ -0,0 +1,143 @@ +be($this->user()); + $arguments = [ + 'attributes' => [ + 'location' => 'balance-amount', + 'startDate' => Carbon::now()->startOfMonth()->format('Ymd'), + 'endDate' => Carbon::now()->endOfMonth()->format('Ymd'), + 'accounts' => 1, + 'accountId' => 1, + 'categoryId' => 1, + 'budgetId' => 1, + 'role' => 3, // diff role, is complicated. + ], + ]; + $uri = route('popup.general') . '?' . http_build_query($arguments); + $response = $this->get($uri); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general + */ + public function testBudgetSpentAmount() + { + + $this->be($this->user()); + $arguments = [ + 'attributes' => [ + 'location' => 'budget-spent-amount', + 'startDate' => Carbon::now()->startOfMonth()->format('Ymd'), + 'endDate' => Carbon::now()->endOfMonth()->format('Ymd'), + 'accounts' => 1, + 'accountId' => 1, + 'categoryId' => 1, + 'budgetId' => 1, + ], + ]; + $uri = route('popup.general') . '?' . http_build_query($arguments); + $response = $this->get($uri); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general + */ + public function testCategoryEntry() + { + + $this->be($this->user()); + $arguments = [ + 'attributes' => [ + 'location' => 'category-entry', + 'startDate' => Carbon::now()->startOfMonth()->format('Ymd'), + 'endDate' => Carbon::now()->endOfMonth()->format('Ymd'), + 'accounts' => 1, + 'accountId' => 1, + 'categoryId' => 1, + 'budgetId' => 1, + ], + ]; + $uri = route('popup.general') . '?' . http_build_query($arguments); + $response = $this->get($uri); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general + */ + public function testExpenseEntry() + { + + $this->be($this->user()); + $arguments = [ + 'attributes' => [ + 'location' => 'expense-entry', + 'startDate' => Carbon::now()->startOfMonth()->format('Ymd'), + 'endDate' => Carbon::now()->endOfMonth()->format('Ymd'), + 'accounts' => 1, + 'accountId' => 1, + 'categoryId' => 1, + 'budgetId' => 1, + ], + ]; + $uri = route('popup.general') . '?' . http_build_query($arguments); + $response = $this->get($uri); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general + */ + public function testIncomeEntry() + { + + $this->be($this->user()); + $arguments = [ + 'attributes' => [ + 'location' => 'income-entry', + 'startDate' => Carbon::now()->startOfMonth()->format('Ymd'), + 'endDate' => Carbon::now()->endOfMonth()->format('Ymd'), + 'accounts' => 1, + 'accountId' => 1, + 'categoryId' => 1, + 'budgetId' => 1, + ], + ]; + $uri = route('popup.general') . '?' . http_build_query($arguments); + $response = $this->get($uri); + $response->assertStatus(200); + } + + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Report/AccountControllerTest.php b/tests/Feature/Controllers/Report/AccountControllerTest.php new file mode 100644 index 0000000000..b3742866a7 --- /dev/null +++ b/tests/Feature/Controllers/Report/AccountControllerTest.php @@ -0,0 +1,29 @@ +be($this->user()); + $response = $this->get(route('report-data.account.general', ['1', '20120101', '20120131'])); + $response->assertStatus(200); + } + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Report/BalanceControllerTest.php b/tests/Feature/Controllers/Report/BalanceControllerTest.php new file mode 100644 index 0000000000..9f86983084 --- /dev/null +++ b/tests/Feature/Controllers/Report/BalanceControllerTest.php @@ -0,0 +1,29 @@ +be($this->user()); + $response = $this->get(route('report-data.balance.general', ['1', '20120101', '20120131'])); + $response->assertStatus(200); + } + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Report/BudgetControllerTest.php b/tests/Feature/Controllers/Report/BudgetControllerTest.php new file mode 100644 index 0000000000..cac69e42ae --- /dev/null +++ b/tests/Feature/Controllers/Report/BudgetControllerTest.php @@ -0,0 +1,39 @@ +be($this->user()); + $response = $this->get(route('report-data.budget.general', ['1', '20120101', '20120131'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Report\BudgetController::period + */ + public function testPeriod() + { + $this->be($this->user()); + $response = $this->get(route('report-data.budget.period', ['1', '20120101', '20120131'])); + $response->assertStatus(200); + } + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Report/CategoryControllerTest.php b/tests/Feature/Controllers/Report/CategoryControllerTest.php new file mode 100644 index 0000000000..a2ee740193 --- /dev/null +++ b/tests/Feature/Controllers/Report/CategoryControllerTest.php @@ -0,0 +1,49 @@ +be($this->user()); + $response = $this->get(route('report-data.category.expenses', ['1', '20120101', '20120131'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Report\CategoryController::income + */ + public function testIncome() + { + $this->be($this->user()); + $response = $this->get(route('report-data.category.income', ['1', '20120101', '20120131'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Report\CategoryController::operations + */ + public function testOperations() + { + $this->be($this->user()); + $response = $this->get(route('report-data.category.operations', ['1', '20120101', '20120131'])); + $response->assertStatus(200); + } + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Report/OperationsControllerTest.php b/tests/Feature/Controllers/Report/OperationsControllerTest.php new file mode 100644 index 0000000000..7f73582bd5 --- /dev/null +++ b/tests/Feature/Controllers/Report/OperationsControllerTest.php @@ -0,0 +1,49 @@ +be($this->user()); + $response = $this->get(route('report-data.operations.expenses', ['1', '20120101', '20120131'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Report\OperationsController::income + */ + public function testIncome() + { + $this->be($this->user()); + $response = $this->get(route('report-data.operations.income', ['1', '20120101', '20120131'])); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Report\OperationsController::operations + */ + public function testOperations() + { + $this->be($this->user()); + $response = $this->get(route('report-data.operations.operations', ['1', '20120101', '20120131'])); + $response->assertStatus(200); + } + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Transaction/ConvertControllerTest.php b/tests/Feature/Controllers/Transaction/ConvertControllerTest.php new file mode 100644 index 0000000000..45f420d617 --- /dev/null +++ b/tests/Feature/Controllers/Transaction/ConvertControllerTest.php @@ -0,0 +1,115 @@ +where('user_id', $this->user()->id)->first(); + + $this->be($this->user()); + $response = $this->get(route('transactions.convert.index', ['transfer', $deposit->id])); + $response->assertStatus(200); + $response->assertSee('Convert a deposit into a transfer'); + } + + /** + * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index + */ + public function testIndexDepositWithdrawal() + { + $deposit = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->first(); + $this->be($this->user()); + $response = $this->get(route('transactions.convert.index', ['withdrawal', $deposit->id])); + $response->assertStatus(200); + $response->assertSee('Convert a deposit into a withdrawal'); + } + + /** + * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index + */ + public function testIndexTransferDeposit() + { + $transfer = TransactionJournal::where('transaction_type_id', 3)->where('user_id', $this->user()->id)->first(); + $this->be($this->user()); + $response = $this->get(route('transactions.convert.index', ['deposit', $transfer->id])); + $response->assertStatus(200); + $response->assertSee('Convert a transfer into a deposit'); + } + + /** + * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index + */ + public function testIndexTransferWithdrawal() + { + $transfer = TransactionJournal::where('transaction_type_id', 3)->where('user_id', $this->user()->id)->first(); + $this->be($this->user()); + $response = $this->get(route('transactions.convert.index', ['withdrawal', $transfer->id])); + $response->assertStatus(200); + $response->assertSee('Convert a transfer into a withdrawal'); + } + + /** + * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index + */ + public function testIndexWithdrawalDeposit() + { + $withdrawal= TransactionJournal::where('transaction_type_id', 1)->where('user_id', $this->user()->id)->first(); + $this->be($this->user()); + $response = $this->get(route('transactions.convert.index', ['deposit', $withdrawal->id])); + $response->assertStatus(200); + $response->assertSee('Convert a withdrawal into a deposit'); + } + + /** + * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index + */ + public function testIndexWithdrawalTransfer() + { + $withdrawal= TransactionJournal::where('transaction_type_id', 1)->where('user_id', $this->user()->id)->first(); + $this->be($this->user()); + $response = $this->get(route('transactions.convert.index', ['transfer', $withdrawal->id])); + $response->assertStatus(200); + $response->assertSee('Convert a withdrawal into a transfer'); + } + + /** + * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::postIndex + */ + public function testPostIndex() + { + $withdrawal= TransactionJournal::where('transaction_type_id', 1)->where('user_id', $this->user()->id)->first(); + // convert a withdrawal to a transfer. Requires the ID of another asset account. + $data = [ + 'destination_account_asset' => 2, + ]; + $this->be($this->user()); + $response = $this->post(route('transactions.convert.index', ['transfer', $withdrawal->id]), $data); + $response->assertStatus(302); + $response->assertRedirect(route('transactions.show', [$withdrawal->id])); + } + + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Transaction/MassControllerTest.php b/tests/Feature/Controllers/Transaction/MassControllerTest.php new file mode 100644 index 0000000000..77fc1b33f2 --- /dev/null +++ b/tests/Feature/Controllers/Transaction/MassControllerTest.php @@ -0,0 +1,103 @@ +where('user_id', $this->user()->id)->take(2)->get()->pluck('id')->toArray(); + $this->be($this->user()); + $response = $this->get(route('transactions.mass.delete', $withdrawals)); + $response->assertStatus(200); + $response->assertSee('Delete a number of transactions'); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                                          '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Transaction\MassController::destroy + */ + public function testDestroy() + { + $this->session(['transactions.mass-delete.url' => 'http://localhost']); + $deposits = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->take(2)->get()->pluck('id')->toArray(); + $data = [ + 'confirm_mass_delete' => $deposits, + ]; + $this->be($this->user()); + $response = $this->post(route('transactions.mass.destroy'), $data); + $response->assertSessionHas('success'); + $response->assertStatus(302); + + // visit them should give 404. + $response = $this->get(route('transactions.show', [$deposits[0]])); + $response->assertStatus(404); + + + } + + /** + * @covers \FireflyIII\Http\Controllers\Transaction\MassController::edit + */ + public function testEdit() + { + $transfers = TransactionJournal::where('transaction_type_id', 3)->where('user_id', $this->user()->id)->take(2)->get()->pluck('id')->toArray(); + $this->be($this->user()); + $response = $this->get(route('transactions.mass.delete', $transfers)); + $response->assertStatus(200); + $response->assertSee('Edit a number of transactions'); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                                            '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Transaction\MassController::update + */ + public function testUpdate() + { + $deposit = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id) + ->whereNull('deleted_at') + ->first(); + $this->session(['transactions.mass-edit.url' => 'http://localhost']); + + $data = [ + 'journals' => [$deposit->id], + 'description' => [$deposit->id => 'Updated salary thing'], + 'amount' => [$deposit->id => 1600], + 'amount_currency_id_amount_' . $deposit->id => 1, + 'date' => [$deposit->id => '2014-07-24'], + 'source_account_name' => [$deposit->id => 'Job'], + 'destination_account_id' => [$deposit->id => 1], + 'category' => [$deposit->id => 'Salary'], + ]; + + $this->be($this->user()); + $response = $this->post(route('transactions.mass.update', [$deposit->id]), $data); + $response->assertSessionHas('success'); + $response->assertStatus(302); + + // visit them should show updated content + $response = $this->get(route('transactions.show', [$deposit->id])); + $response->assertStatus(200); + $response->assertSee('Updated salary thing'); + } + + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Transaction/SingleControllerTest.php b/tests/Feature/Controllers/Transaction/SingleControllerTest.php new file mode 100644 index 0000000000..423a1319d7 --- /dev/null +++ b/tests/Feature/Controllers/Transaction/SingleControllerTest.php @@ -0,0 +1,135 @@ +be($this->user()); + $response = $this->get(route('transactions.create', ['withdrawal'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                                              '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::delete + */ + public function testDelete() + { + $this->be($this->user()); + $response = $this->get(route('transactions.delete', [12])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                                                '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::destroy + */ + public function testDestroy() + { + $this->session(['transactions.delete.url' => 'http://localhost']); + $this->be($this->user()); + + $repository = $this->mock(JournalRepositoryInterface::class); + $repository->shouldReceive('first')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('delete')->once(); + + $response = $this->post(route('transactions.destroy', [13])); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::edit + */ + public function testEdit() + { + $this->be($this->user()); + $response = $this->get(route('transactions.edit', [13])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                                                  '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::store + */ + public function testStore() + { + $this->session(['transactions.create.url' => 'http://localhost']); + $this->be($this->user()); + + $data = [ + 'what' => 'withdrawal', + 'amount' => '10', + 'amount_currency_id_amount' => 1, + 'source_account_id' => 1, + 'destination_account_name' => 'Some destination', + 'date' => '2016-01-01', + 'description' => 'Test descr', + ]; + $response = $this->post(route('transactions.store', ['withdrawal']), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::update + */ + public function testUpdate() + { + $this->session(['transactions.edit.url' => 'http://localhost']); + $this->be($this->user()); + $data = [ + 'id' => 123, + 'what' => 'withdrawal', + 'description' => 'Updated groceries', + 'source_account_id' => 1, + 'destination_account_name' => 'PLUS', + 'amount' => '123', + 'amount_currency_id_amount' => 1, + 'budget_id' => 1, + 'category' => 'Daily groceries', + 'tags' => '', + 'date' => '2016-01-01', + ]; + + $response = $this->post(route('transactions.update', [123]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + + $response = $this->get(route('transactions.show', [123])); + $response->assertStatus(200); + $response->assertSee('Updated groceries'); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                                                    '); + + } + +} \ No newline at end of file diff --git a/tests/Feature/Controllers/Transaction/SplitControllerTest.php b/tests/Feature/Controllers/Transaction/SplitControllerTest.php new file mode 100644 index 0000000000..006fad5ab8 --- /dev/null +++ b/tests/Feature/Controllers/Transaction/SplitControllerTest.php @@ -0,0 +1,78 @@ +where('user_id', $this->user()->id)->first(); + $this->be($this->user()); + $response = $this->get(route('transactions.split.edit', [$deposit->id])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                                                      '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::update + * Implement testUpdate(). + */ + public function testUpdate() + { + $this->session(['transactions.edit-split.url' => 'http://localhost']); + $deposit = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->first(); + $data = [ + 'id' => $deposit->id, + 'what' => 'deposit', + 'journal_description' => 'Updated salary', + 'currency_id' => 1, + 'journal_destination_account_id' => 1, + 'journal_amount' => 1591, + 'date' => '2014-01-24', + 'tags' => '', + 'transactions' => [ + [ + 'description' => 'Split #1', + 'source_account_name' => 'Job', + 'amount' => 1591, + 'category' => '', + ], + ], + ]; + $this->be($this->user()); + $response = $this->post(route('transactions.split.update', [$deposit->id]), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + + // journal is updated? + $response = $this->get(route('transactions.show', [$deposit->id])); + $response->assertStatus(200); + $response->assertSee('Updated salary'); + // has bread crumb + $response->assertSee('
                                                                                                                                                                                                                                                                                                                                                                                                        '); + } + +} \ No newline at end of file From 5801eba22a9aaad7749cb46fc603294a31543870 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 12 Feb 2017 18:47:17 +0100 Subject: [PATCH 101/276] Updated composer.lock file. --- composer.lock | 154 +++++++++++++++++++++++++------------------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/composer.lock b/composer.lock index 1c8211b043..fea0f26c74 100644 --- a/composer.lock +++ b/composer.lock @@ -433,16 +433,16 @@ }, { "name": "doctrine/dbal", - "version": "v2.5.11", + "version": "v2.5.12", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "1b1effbddbdc0f40d1c8f849f44bcddac4f52a48" + "reference": "7b9e911f9d8b30d43b96853dab26898c710d8f44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/1b1effbddbdc0f40d1c8f849f44bcddac4f52a48", - "reference": "1b1effbddbdc0f40d1c8f849f44bcddac4f52a48", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/7b9e911f9d8b30d43b96853dab26898c710d8f44", + "reference": "7b9e911f9d8b30d43b96853dab26898c710d8f44", "shasum": "" }, "require": { @@ -500,7 +500,7 @@ "persistence", "queryobject" ], - "time": "2017-02-04T21:20:13+00:00" + "time": "2017-02-08T12:53:47+00:00" }, { "name": "doctrine/inflector", @@ -667,16 +667,16 @@ }, { "name": "laravel/framework", - "version": "v5.4.9", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "600330ae1d218919b3b307e0578461a2df248663" + "reference": "9cee8db07cfac13a3a49d17388c9ced4c52e17ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/600330ae1d218919b3b307e0578461a2df248663", - "reference": "600330ae1d218919b3b307e0578461a2df248663", + "url": "https://api.github.com/repos/laravel/framework/zipball/9cee8db07cfac13a3a49d17388c9ced4c52e17ac", + "reference": "9cee8db07cfac13a3a49d17388c9ced4c52e17ac", "shasum": "" }, "require": { @@ -792,7 +792,7 @@ "framework", "laravel" ], - "time": "2017-02-03T19:47:35+00:00" + "time": "2017-02-10T19:40:54+00:00" }, { "name": "laravelcollective/html", @@ -976,16 +976,16 @@ }, { "name": "league/flysystem", - "version": "1.0.34", + "version": "1.0.35", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "469ad53c13ea19a0e54e3e5d70f61227ddcc0299" + "reference": "dda7f3ab94158a002d9846a97dc18ebfb7acc062" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/469ad53c13ea19a0e54e3e5d70f61227ddcc0299", - "reference": "469ad53c13ea19a0e54e3e5d70f61227ddcc0299", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/dda7f3ab94158a002d9846a97dc18ebfb7acc062", + "reference": "dda7f3ab94158a002d9846a97dc18ebfb7acc062", "shasum": "" }, "require": { @@ -1055,7 +1055,7 @@ "sftp", "storage" ], - "time": "2017-01-30T17:41:17+00:00" + "time": "2017-02-09T11:33:58+00:00" }, { "name": "monolog/monolog", @@ -1639,16 +1639,16 @@ }, { "name": "symfony/console", - "version": "v3.2.2", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "4f9e449e76996adf310498a8ca955c6deebe29dd" + "reference": "7a8405a9fc175f87fed8a3c40856b0d866d61936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/4f9e449e76996adf310498a8ca955c6deebe29dd", - "reference": "4f9e449e76996adf310498a8ca955c6deebe29dd", + "url": "https://api.github.com/repos/symfony/console/zipball/7a8405a9fc175f87fed8a3c40856b0d866d61936", + "reference": "7a8405a9fc175f87fed8a3c40856b0d866d61936", "shasum": "" }, "require": { @@ -1698,7 +1698,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-01-08T20:47:33+00:00" + "time": "2017-02-06T12:04:21+00:00" }, { "name": "symfony/css-selector", @@ -1755,16 +1755,16 @@ }, { "name": "symfony/debug", - "version": "v3.2.2", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "810ba5c1c5352a4ddb15d4719e8936751dff0b05" + "reference": "b4d9818f127c60ce21ed62c395da7df868dc8477" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/810ba5c1c5352a4ddb15d4719e8936751dff0b05", - "reference": "810ba5c1c5352a4ddb15d4719e8936751dff0b05", + "url": "https://api.github.com/repos/symfony/debug/zipball/b4d9818f127c60ce21ed62c395da7df868dc8477", + "reference": "b4d9818f127c60ce21ed62c395da7df868dc8477", "shasum": "" }, "require": { @@ -1808,11 +1808,11 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-01-02T20:32:22+00:00" + "time": "2017-01-28T02:37:08+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.2.2", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -1872,7 +1872,7 @@ }, { "name": "symfony/finder", - "version": "v3.2.2", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -1921,16 +1921,16 @@ }, { "name": "symfony/http-foundation", - "version": "v3.2.2", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "33eb76bf1d833c705433e5361a646c164696394b" + "reference": "e192b04de44aa1ed0e39d6793f7e06f5e0b672a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/33eb76bf1d833c705433e5361a646c164696394b", - "reference": "33eb76bf1d833c705433e5361a646c164696394b", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e192b04de44aa1ed0e39d6793f7e06f5e0b672a0", + "reference": "e192b04de44aa1ed0e39d6793f7e06f5e0b672a0", "shasum": "" }, "require": { @@ -1970,20 +1970,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2017-01-08T20:47:33+00:00" + "time": "2017-02-02T13:47:35+00:00" }, { "name": "symfony/http-kernel", - "version": "v3.2.2", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "8a898e340a89022246645b1288d295f49c9381e4" + "reference": "96443239baf674b143604fb87cb27cb01672ab77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8a898e340a89022246645b1288d295f49c9381e4", - "reference": "8a898e340a89022246645b1288d295f49c9381e4", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/96443239baf674b143604fb87cb27cb01672ab77", + "reference": "96443239baf674b143604fb87cb27cb01672ab77", "shasum": "" }, "require": { @@ -2052,7 +2052,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2017-01-12T21:36:33+00:00" + "time": "2017-02-06T13:15:19+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -2223,16 +2223,16 @@ }, { "name": "symfony/process", - "version": "v3.2.2", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "350e810019fc52dd06ae844b6a6d382f8a0e8893" + "reference": "32646a7cf53f3956c76dcb5c82555224ae321858" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/350e810019fc52dd06ae844b6a6d382f8a0e8893", - "reference": "350e810019fc52dd06ae844b6a6d382f8a0e8893", + "url": "https://api.github.com/repos/symfony/process/zipball/32646a7cf53f3956c76dcb5c82555224ae321858", + "reference": "32646a7cf53f3956c76dcb5c82555224ae321858", "shasum": "" }, "require": { @@ -2268,20 +2268,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-01-02T20:32:22+00:00" + "time": "2017-02-03T12:11:38+00:00" }, { "name": "symfony/routing", - "version": "v3.2.2", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "fda2c67d47ec801726ca888c95d701d31b27b444" + "reference": "af464432c177dbcdbb32295113b7627500331f2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/fda2c67d47ec801726ca888c95d701d31b27b444", - "reference": "fda2c67d47ec801726ca888c95d701d31b27b444", + "url": "https://api.github.com/repos/symfony/routing/zipball/af464432c177dbcdbb32295113b7627500331f2d", + "reference": "af464432c177dbcdbb32295113b7627500331f2d", "shasum": "" }, "require": { @@ -2343,20 +2343,20 @@ "uri", "url" ], - "time": "2017-01-02T20:32:22+00:00" + "time": "2017-01-28T02:37:08+00:00" }, { "name": "symfony/translation", - "version": "v3.2.2", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "6520f3d4cce604d9dd1e86cac7af954984dd9bda" + "reference": "ca032cc56976d88b85e7386b17020bc6dc95dbc5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/6520f3d4cce604d9dd1e86cac7af954984dd9bda", - "reference": "6520f3d4cce604d9dd1e86cac7af954984dd9bda", + "url": "https://api.github.com/repos/symfony/translation/zipball/ca032cc56976d88b85e7386b17020bc6dc95dbc5", + "reference": "ca032cc56976d88b85e7386b17020bc6dc95dbc5", "shasum": "" }, "require": { @@ -2407,20 +2407,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2017-01-02T20:32:22+00:00" + "time": "2017-01-21T17:06:35+00:00" }, { "name": "symfony/var-dumper", - "version": "v3.2.2", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "b54b23f9a19b465e76fdaac0f6732410467c83b2" + "reference": "5bb4435a03a4f05c211f4a9a8ee2756965924511" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b54b23f9a19b465e76fdaac0f6732410467c83b2", - "reference": "b54b23f9a19b465e76fdaac0f6732410467c83b2", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/5bb4435a03a4f05c211f4a9a8ee2756965924511", + "reference": "5bb4435a03a4f05c211f4a9a8ee2756965924511", "shasum": "" }, "require": { @@ -2470,7 +2470,7 @@ "debug", "dump" ], - "time": "2017-01-03T08:53:57+00:00" + "time": "2017-01-24T12:58:58+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -3061,16 +3061,16 @@ }, { "name": "mockery/mockery", - "version": "0.9.7", + "version": "0.9.8", "source": { "type": "git", "url": "https://github.com/padraic/mockery.git", - "reference": "4de7969f4664da3cef1ccd83866c9f59378c3371" + "reference": "1e5e2ffdc4d71d7358ed58a6fdd30a4a0c506855" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/padraic/mockery/zipball/4de7969f4664da3cef1ccd83866c9f59378c3371", - "reference": "4de7969f4664da3cef1ccd83866c9f59378c3371", + "url": "https://api.github.com/repos/padraic/mockery/zipball/1e5e2ffdc4d71d7358ed58a6fdd30a4a0c506855", + "reference": "1e5e2ffdc4d71d7358ed58a6fdd30a4a0c506855", "shasum": "" }, "require": { @@ -3122,7 +3122,7 @@ "test double", "testing" ], - "time": "2016-12-19T14:50:55+00:00" + "time": "2017-02-09T13:29:38+00:00" }, { "name": "myclabs/deep-copy", @@ -3621,16 +3621,16 @@ }, { "name": "phpunit/phpunit", - "version": "5.7.10", + "version": "5.7.13", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "bf0804199f516fe80ffcc48ac6d4741c49baeb6e" + "reference": "60ebeed87a35ea46fd7f7d8029df2d6f013ebb34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bf0804199f516fe80ffcc48ac6d4741c49baeb6e", - "reference": "bf0804199f516fe80ffcc48ac6d4741c49baeb6e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/60ebeed87a35ea46fd7f7d8029df2d6f013ebb34", + "reference": "60ebeed87a35ea46fd7f7d8029df2d6f013ebb34", "shasum": "" }, "require": { @@ -3699,7 +3699,7 @@ "testing", "xunit" ], - "time": "2017-02-04T09:03:53+00:00" + "time": "2017-02-10T09:05:10+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -4275,16 +4275,16 @@ }, { "name": "symfony/class-loader", - "version": "v3.2.2", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", - "reference": "0152f7a47acd564ca62c652975c2b32ac6d613a6" + "reference": "2847d56f518ad5721bf85aa9174b3aa3fd12aa03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/0152f7a47acd564ca62c652975c2b32ac6d613a6", - "reference": "0152f7a47acd564ca62c652975c2b32ac6d613a6", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/2847d56f518ad5721bf85aa9174b3aa3fd12aa03", + "reference": "2847d56f518ad5721bf85aa9174b3aa3fd12aa03", "shasum": "" }, "require": { @@ -4327,7 +4327,7 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2017-01-10T14:14:38+00:00" + "time": "2017-01-21T17:06:35+00:00" }, { "name": "symfony/dom-crawler", @@ -4387,16 +4387,16 @@ }, { "name": "symfony/yaml", - "version": "v3.2.2", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "50eadbd7926e31842893c957eca362b21592a97d" + "reference": "e1718c6bf57e1efbb8793ada951584b2ab27775b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/50eadbd7926e31842893c957eca362b21592a97d", - "reference": "50eadbd7926e31842893c957eca362b21592a97d", + "url": "https://api.github.com/repos/symfony/yaml/zipball/e1718c6bf57e1efbb8793ada951584b2ab27775b", + "reference": "e1718c6bf57e1efbb8793ada951584b2ab27775b", "shasum": "" }, "require": { @@ -4438,7 +4438,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-01-03T13:51:32+00:00" + "time": "2017-01-21T17:06:35+00:00" }, { "name": "webmozart/assert", From 75e0d19b4e990d5d0fea1fb83265bd8b9d0b4ac0 Mon Sep 17 00:00:00 2001 From: Patrick Kostjens Date: Sun, 12 Feb 2017 19:37:37 +0100 Subject: [PATCH 102/276] Refactored docker-compose files to use base with dev/prod overrides --- docker-compose.override.yml | 14 ++++++++++++++ docker-compose.prod.yml | 24 ------------------------ docker-compose.yml | 5 +---- 3 files changed, 15 insertions(+), 28 deletions(-) create mode 100644 docker-compose.override.yml diff --git a/docker-compose.override.yml b/docker-compose.override.yml new file mode 100644 index 0000000000..6231c2fdb5 --- /dev/null +++ b/docker-compose.override.yml @@ -0,0 +1,14 @@ +version: '2' + +services: + firefly-db: + volumes: + - firefly-dev-storage:/var/lib/mysql + firefly-app: + environment: + - INIT_DATABASE=yes + - FF_APP_ENV=development + +volumes: + firefly-dev-storage: + driver: local diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 42944a9023..69f91764d5 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,33 +1,9 @@ version: '2' services: - firefly-db: - image: mysql:8 - environment: - - MYSQL_DATABASE=firefly_db - - MYSQL_USER=firefly_db - - MYSQL_PASSWORD=firefly_db_secret - - MYSQL_RANDOM_ROOT_PASSWORD=yes - volumes: - - firefly-db-storage:/var/lib/mysql - firefly-app: - image: firefly-iii container_name: firefly-iii - build: . environment: - - FF_DB_HOST=firefly-db - - FF_DB_NAME=firefly_db - - FF_DB_USER=firefly_db - - FF_DB_PASSWORD=firefly_db_secret - - FF_APP_KEY=SomeRandomStringOf32CharsExactly - FF_APP_ENV=production - ports: - - "80:80" - links: - - firefly-db volumes: - ./storage:/var/www/firefly-iii/storage -volumes: - firefly-db-storage: - driver: local diff --git a/docker-compose.yml b/docker-compose.yml index a7c42b18a0..92f79e2ea6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,16 +13,13 @@ services: firefly-app: image: firefly-iii - build: - context: . + build: . environment: - - INIT_DATABASE=yes - FF_DB_HOST=firefly-db - FF_DB_NAME=firefly_db - FF_DB_USER=firefly_db - FF_DB_PASSWORD=firefly_db_secret - FF_APP_KEY=SomeRandomStringOf32CharsExactly - - FF_APP_ENV=development ports: - "80:80" links: From e42f8581664fbadb939fedc7e0eea01946e1a63d Mon Sep 17 00:00:00 2001 From: Patrick Kostjens Date: Sun, 12 Feb 2017 20:41:29 +0100 Subject: [PATCH 103/276] Incorporate review comment: Remove unneeded container name setting in docker-compose --- docker-compose.prod.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 69f91764d5..c16d46bf69 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -2,7 +2,6 @@ version: '2' services: firefly-app: - container_name: firefly-iii environment: - FF_APP_ENV=production volumes: From a1d40a57484f5b521e78707ed9d97dc317c0a707 Mon Sep 17 00:00:00 2001 From: Patrick Kostjens Date: Sun, 12 Feb 2017 20:52:26 +0100 Subject: [PATCH 104/276] Mount local code base in development docker-compose --- docker-compose.override.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 6231c2fdb5..a51bc21b02 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -4,6 +4,7 @@ services: firefly-db: volumes: - firefly-dev-storage:/var/lib/mysql + - .:/var/www/firefly-iii firefly-app: environment: - INIT_DATABASE=yes From bc4cf1a367d95412c807b107d474abe2f1fb1d02 Mon Sep 17 00:00:00 2001 From: Patrick Kostjens Date: Sun, 12 Feb 2017 21:04:15 +0100 Subject: [PATCH 105/276] Incorporate comments: Use Docker storage instead of local folder for app storage --- docker-compose.prod.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index c16d46bf69..68fdff69a1 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -5,4 +5,8 @@ services: environment: - FF_APP_ENV=production volumes: - - ./storage:/var/www/firefly-iii/storage + - firefly-app-storage:/var/www/firefly-iii/storage + +volumes: + firefly-app-storage: + driver: local From e9a67b1c82dc390dc746b23402d8fd7a18fa8735 Mon Sep 17 00:00:00 2001 From: Patrick Kostjens Date: Sun, 12 Feb 2017 21:38:58 +0100 Subject: [PATCH 106/276] Bugfix: Mount app in app container instead of db container --- docker-compose.override.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index a51bc21b02..c8ce8bea02 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -4,8 +4,9 @@ services: firefly-db: volumes: - firefly-dev-storage:/var/lib/mysql - - .:/var/www/firefly-iii firefly-app: + volumes: + - .:/var/www/firefly-iii environment: - INIT_DATABASE=yes - FF_APP_ENV=development From 7a34536c8007a3d0af1b922dc0c03139943caf5b Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 13 Feb 2017 20:39:23 +0100 Subject: [PATCH 107/276] Fixes #565 --- app/Http/Requests/SplitJournalFormRequest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Requests/SplitJournalFormRequest.php b/app/Http/Requests/SplitJournalFormRequest.php index 5efba69243..3d82027c6b 100644 --- a/app/Http/Requests/SplitJournalFormRequest.php +++ b/app/Http/Requests/SplitJournalFormRequest.php @@ -13,6 +13,7 @@ declare(strict_types = 1); namespace FireflyIII\Http\Requests; +use Steam; /** * Class SplitJournalFormRequest @@ -101,7 +102,7 @@ class SplitJournalFormRequest extends Request $category = $categories[$index] ?? ''; $transaction = [ 'description' => $description, - 'amount' => $amounts[$index], + 'amount' => Steam::positive($amounts[$index]), 'budget_id' => $budgets[$index] ?? 0, 'category' => $category, 'source_account_id' => $srcAccountIds[$index] ?? $this->get('journal_source_account_id'), From 47aa996b6bd6b6e16fc4eb655d8294a88702a3ca Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 15:12:46 +0100 Subject: [PATCH 108/276] This fixes #567 --- app/Http/Controllers/Transaction/ConvertController.php | 2 +- app/Http/breadcrumbs.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php index 45f5583b9a..3fb1e41de7 100644 --- a/app/Http/Controllers/Transaction/ConvertController.php +++ b/app/Http/Controllers/Transaction/ConvertController.php @@ -145,7 +145,7 @@ class ConvertController extends Controller $errors = $repository->convert($journal, $destinationType, $source, $destination); if ($errors->count() > 0) { - return redirect(route('transactions.convert', [strtolower($destinationType->type), $journal->id]))->withErrors($errors)->withInput(); + return redirect(route('transactions.convert.index', [strtolower($destinationType->type), $journal->id]))->withErrors($errors)->withInput(); } Session::flash('success', trans('firefly.converted_to_' . $destinationType->type)); diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index b7a64a5c07..05bf0acb56 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -772,7 +772,7 @@ Breadcrumbs::register( $breadcrumbs->parent('transactions.show', $journal); $breadcrumbs->push( trans('firefly.convert_to_' . $destinationType->type, ['description' => $journal->description]), - route('transactions.convert', [strtolower($destinationType->type), $journal->id]) + route('transactions.convert.index', [strtolower($destinationType->type), $journal->id]) ); } ); From cf2cd9680bb1c4e68ab8917df0a4a513a0005427 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 15:18:52 +0100 Subject: [PATCH 109/276] This fixes #569 --- app/Import/Setup/CsvSetup.php | 17 ++++++++++++----- resources/views/import/csv/roles.twig | 8 +++++++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/Import/Setup/CsvSetup.php b/app/Import/Setup/CsvSetup.php index ff20d45958..ddf17a5ca2 100644 --- a/app/Import/Setup/CsvSetup.php +++ b/app/Import/Setup/CsvSetup.php @@ -439,8 +439,9 @@ class CsvSetup implements SetupInterface Log::debug('Now in getDataForColumnRoles()'); $config = $this->job->configuration; $data = [ - 'columns' => [], - 'columnCount' => 0, + 'columns' => [], + 'columnCount' => 0, + 'columnHeaders' => [], ]; // show user column role configuration. @@ -449,8 +450,13 @@ class CsvSetup implements SetupInterface // create CSV reader. $reader = Reader::createFromString($content); $reader->setDelimiter($config['delimiter']); - $start = $config['has-headers'] ? 1 : 0; - $end = $start + config('csv.example_rows'); + $start = $config['has-headers'] ? 1 : 0; + $end = $start + config('csv.example_rows'); + $header = []; + if ($config['has-headers']) { + $header = $reader->fetchOne(0); + } + // collect example data in $data['columns'] Log::debug(sprintf('While %s is smaller than %d', $start, $end)); @@ -468,7 +474,8 @@ class CsvSetup implements SetupInterface } foreach ($row as $index => $value) { - $value = trim($value); + $value = trim($value); + $data['columnHeaders'][$index] = $header[$index] ?? ''; if (strlen($value) > 0) { $data['columns'][$index][] = $value; } diff --git a/resources/views/import/csv/roles.twig b/resources/views/import/csv/roles.twig index 74cf95b948..0df197187b 100644 --- a/resources/views/import/csv/roles.twig +++ b/resources/views/import/csv/roles.twig @@ -45,7 +45,13 @@ {% for i in 0..(data.columnCount-1) %} - {{ trans('csv.column') }} #{{ loop.index }} + + {% if data.columnHeaders[i] == '' %} + {{ trans('csv.column') }} #{{ loop.index }} + {% else %} + {{ data.columnHeaders[i] }} + {% endif %} + {% if data.columns[i]|length == 0 %} {{ trans('csv.no_example_data') }} From fa54763425c7dd3efd29c1da281bd513ec6ad9c5 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 15:22:04 +0100 Subject: [PATCH 110/276] This fixes #570 --- app/Providers/AppServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 56ff3467cf..d8dd3843f5 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -33,7 +33,7 @@ class AppServiceProvider extends ServiceProvider // force root URL. $forcedUrl = env('APP_FORCE_ROOT', ''); - if (strlen($forcedUrl) > 0) { + if (strlen(strval($forcedUrl)) > 0) { URL::forceRootUrl($forcedUrl); } From f0783df1239f2255ed4c7e2426f03ef8170bfc13 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 15:24:01 +0100 Subject: [PATCH 111/276] This should fix #566 --- app/Http/Controllers/Auth/LoginController.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 016be84894..04e8abcc06 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -30,13 +30,6 @@ class LoginController extends Controller use AuthenticatesUsers; - /** - * Where to redirect users after login / registration. - * - * @var string - */ - protected $redirectTo = '/'; - /** * Create a new controller instance. * @@ -100,6 +93,14 @@ class LoginController extends Controller return redirect('/'); } + /** + * @return string + */ + public function redirectTo(): string + { + return route('index'); + } + /** * Show the application login form. * From 636b371b86ec10f1093a625b18215c6556984d73 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 16:20:16 +0100 Subject: [PATCH 112/276] Fixes #553 --- app/Generator/Report/Audit/MonthReportGenerator.php | 1 - app/Generator/Report/Budget/MonthReportGenerator.php | 1 - app/Generator/Report/Category/MonthReportGenerator.php | 2 -- app/Helpers/Chart/MetaPieChart.php | 2 -- app/Helpers/Report/ReportHelper.php | 1 - app/Http/Controllers/Chart/BudgetController.php | 1 - app/Http/Controllers/Chart/BudgetReportController.php | 3 --- app/Http/Controllers/Chart/CategoryReportController.php | 6 ------ app/Http/Controllers/Popup/ReportController.php | 7 ------- app/Import/Setup/CsvSetup.php | 2 -- app/Jobs/ExecuteRuleGroupOnExistingTransactions.php | 2 +- 11 files changed, 1 insertion(+), 27 deletions(-) diff --git a/app/Generator/Report/Audit/MonthReportGenerator.php b/app/Generator/Report/Audit/MonthReportGenerator.php index 02cc9d08c2..d210f8b5d3 100644 --- a/app/Generator/Report/Audit/MonthReportGenerator.php +++ b/app/Generator/Report/Audit/MonthReportGenerator.php @@ -140,7 +140,6 @@ class MonthReportGenerator implements ReportGeneratorInterface /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end); $journals = $collector->getJournals(); $journals = $journals->reverse(); diff --git a/app/Generator/Report/Budget/MonthReportGenerator.php b/app/Generator/Report/Budget/MonthReportGenerator.php index 3ab5227ecc..d3166ead4e 100644 --- a/app/Generator/Report/Budget/MonthReportGenerator.php +++ b/app/Generator/Report/Budget/MonthReportGenerator.php @@ -186,7 +186,6 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAccounts($this->accounts)->setRange($this->start, $this->end) ->setTypes([TransactionType::WITHDRAWAL]) ->setBudgets($this->budgets)->withOpposingAccount()->disableFilter(); diff --git a/app/Generator/Report/Category/MonthReportGenerator.php b/app/Generator/Report/Category/MonthReportGenerator.php index 865121006e..d137b6e8b5 100644 --- a/app/Generator/Report/Category/MonthReportGenerator.php +++ b/app/Generator/Report/Category/MonthReportGenerator.php @@ -196,7 +196,6 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAccounts($this->accounts)->setRange($this->start, $this->end) ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) ->setCategories($this->categories)->withOpposingAccount()->disableFilter(); @@ -220,7 +219,6 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAccounts($this->accounts)->setRange($this->start, $this->end) ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) ->setCategories($this->categories)->withOpposingAccount(); diff --git a/app/Helpers/Chart/MetaPieChart.php b/app/Helpers/Chart/MetaPieChart.php index c2a87fbe95..66addbd0b1 100644 --- a/app/Helpers/Chart/MetaPieChart.php +++ b/app/Helpers/Chart/MetaPieChart.php @@ -99,7 +99,6 @@ class MetaPieChart implements MetaPieChartInterface if ($this->collectOtherObjects && $direction === 'income') { /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)->setTypes([TransactionType::DEPOSIT]); $journals = $collector->getJournals(); $sum = strval($journals->sum('transaction_amount')); @@ -205,7 +204,6 @@ class MetaPieChart implements MetaPieChartInterface } /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAccounts($this->accounts); $collector->setRange($this->start, $this->end); $collector->setTypes($types); diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php index f49805cd1b..2dfb605ee3 100644 --- a/app/Helpers/Report/ReportHelper.php +++ b/app/Helpers/Report/ReportHelper.php @@ -69,7 +69,6 @@ class ReportHelper implements ReportHelperInterface $repository = app(BillRepositoryInterface::class); $bills = $repository->getBillsForAccounts($accounts); $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAccounts($accounts)->setRange($start, $end)->setBills($bills); $journals = $collector->getJournals(); $collection = new BillCollection; diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index 2c792fa908..cf99421aee 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -417,7 +417,6 @@ class BudgetController extends Controller // collector /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $types = [TransactionType::WITHDRAWAL]; $collector->setAllAssetAccounts()->setTypes($types)->setRange($start, $end)->withoutBudget(); $journals = $collector->getJournals(); diff --git a/app/Http/Controllers/Chart/BudgetReportController.php b/app/Http/Controllers/Chart/BudgetReportController.php index b5ab26355c..d570eae6b8 100644 --- a/app/Http/Controllers/Chart/BudgetReportController.php +++ b/app/Http/Controllers/Chart/BudgetReportController.php @@ -80,7 +80,6 @@ class BudgetReportController extends Controller $helper = app(MetaPieChartInterface::class); $helper->setAccounts($accounts); $helper->setBudgets($budgets); - $helper->setUser(auth()->user()); $helper->setStart($start); $helper->setEnd($end); $helper->setCollectOtherObjects(intval($others) === 1); @@ -106,7 +105,6 @@ class BudgetReportController extends Controller $helper = app(MetaPieChartInterface::class); $helper->setAccounts($accounts); $helper->setBudgets($budgets); - $helper->setUser(auth()->user()); $helper->setStart($start); $helper->setEnd($end); $helper->setCollectOtherObjects(intval($others) === 1); @@ -240,7 +238,6 @@ class BudgetReportController extends Controller { /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) ->setBudgets($budgets)->withOpposingAccount()->disableFilter(); $accountIds = $accounts->pluck('id')->toArray(); diff --git a/app/Http/Controllers/Chart/CategoryReportController.php b/app/Http/Controllers/Chart/CategoryReportController.php index 0cd50c308c..94f6cfb370 100644 --- a/app/Http/Controllers/Chart/CategoryReportController.php +++ b/app/Http/Controllers/Chart/CategoryReportController.php @@ -80,7 +80,6 @@ class CategoryReportController extends Controller $helper = app(MetaPieChartInterface::class); $helper->setAccounts($accounts); $helper->setCategories($categories); - $helper->setUser(auth()->user()); $helper->setStart($start); $helper->setEnd($end); $helper->setCollectOtherObjects(intval($others) === 1); @@ -105,7 +104,6 @@ class CategoryReportController extends Controller $helper = app(MetaPieChartInterface::class); $helper->setAccounts($accounts); $helper->setCategories($categories); - $helper->setUser(auth()->user()); $helper->setStart($start); $helper->setEnd($end); $helper->setCollectOtherObjects(intval($others) === 1); @@ -130,7 +128,6 @@ class CategoryReportController extends Controller $helper = app(MetaPieChartInterface::class); $helper->setAccounts($accounts); $helper->setCategories($categories); - $helper->setUser(auth()->user()); $helper->setStart($start); $helper->setEnd($end); $helper->setCollectOtherObjects(intval($others) === 1); @@ -156,7 +153,6 @@ class CategoryReportController extends Controller $helper = app(MetaPieChartInterface::class); $helper->setAccounts($accounts); $helper->setCategories($categories); - $helper->setUser(auth()->user()); $helper->setStart($start); $helper->setEnd($end); $helper->setCollectOtherObjects(intval($others) === 1); @@ -285,7 +281,6 @@ class CategoryReportController extends Controller { /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) ->setCategories($categories)->withOpposingAccount()->disableFilter(); $accountIds = $accounts->pluck('id')->toArray(); @@ -307,7 +302,6 @@ class CategoryReportController extends Controller { /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) ->setCategories($categories)->withOpposingAccount(); $accountIds = $accounts->pluck('id')->toArray(); diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index 7bd8803fa5..a2f3505923 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -104,7 +104,6 @@ class ReportController extends Controller case ($role === BalanceLine::ROLE_DEFAULTROLE && !is_null($budget->id)): /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector ->setAccounts(new Collection([$account])) ->setRange($attributes['startDate'], $attributes['endDate']) @@ -116,7 +115,6 @@ class ReportController extends Controller $budget->name = strval(trans('firefly.no_budget')); /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector ->setAccounts(new Collection([$account])) ->setTypes($types) @@ -127,7 +125,6 @@ class ReportController extends Controller case ($role === BalanceLine::ROLE_DIFFROLE): /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector ->setAccounts(new Collection([$account])) ->setTypes($types) @@ -173,7 +170,6 @@ class ReportController extends Controller $budget = $repository->find(intval($attributes['budgetId'])); /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector ->setAccounts($attributes['accounts']) @@ -208,7 +204,6 @@ class ReportController extends Controller $types = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER]; /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAccounts($attributes['accounts'])->setTypes($types) ->setRange($attributes['startDate'], $attributes['endDate']) ->setCategory($category); @@ -236,7 +231,6 @@ class ReportController extends Controller $types = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER]; /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate'])->setTypes($types); $journals = $collector->getJournals(); $report = $attributes['accounts']->pluck('id')->toArray(); // accounts used in this report @@ -273,7 +267,6 @@ class ReportController extends Controller $types = [TransactionType::DEPOSIT, TransactionType::TRANSFER]; /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); $collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate'])->setTypes($types); $journals = $collector->getJournals(); $report = $attributes['accounts']->pluck('id')->toArray(); // accounts used in this report diff --git a/app/Import/Setup/CsvSetup.php b/app/Import/Setup/CsvSetup.php index ddf17a5ca2..3d0fc10ed3 100644 --- a/app/Import/Setup/CsvSetup.php +++ b/app/Import/Setup/CsvSetup.php @@ -182,8 +182,6 @@ class CsvSetup implements SetupInterface { /** @var AccountRepositoryInterface $repository */ $repository = app(AccountRepositoryInterface::class); - $repository->setUser(auth()->user()); - $importId = $data['csv_import_account'] ?? 0; $account = $repository->find(intval($importId)); diff --git a/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php b/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php index 15a852414e..0ac899ffcb 100644 --- a/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php +++ b/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php @@ -157,7 +157,7 @@ class ExecuteRuleGroupOnExistingTransactions extends Job implements ShouldQueue { /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setUser(auth()->user()); + $collector->setUser($this->user); $collector->setAccounts($this->accounts)->setRange($this->startDate, $this->endDate); return $collector->getJournals(); From 395a7bb33ca5431715a55dc05d29b3ca451fc234 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 17:07:56 +0100 Subject: [PATCH 113/276] This should fix the tests --- app/Helpers/Chart/MetaPieChart.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Helpers/Chart/MetaPieChart.php b/app/Helpers/Chart/MetaPieChart.php index 66addbd0b1..6c340b5389 100644 --- a/app/Helpers/Chart/MetaPieChart.php +++ b/app/Helpers/Chart/MetaPieChart.php @@ -261,7 +261,6 @@ class MetaPieChart implements MetaPieChartInterface $chartData = []; $names = []; $repository = app($this->repositories[$type]); - $repository->setUser($this->user); foreach ($array as $objectId => $amount) { if (!isset($names[$objectId])) { $object = $repository->find(intval($objectId)); From 893f2d2c55253a05f3c62611777f88c5dff629b8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 17:17:15 +0100 Subject: [PATCH 114/276] Include code climate config [skip ci] --- .codeclimate.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .codeclimate.yml diff --git a/.codeclimate.yml b/.codeclimate.yml new file mode 100644 index 0000000000..c521815c72 --- /dev/null +++ b/.codeclimate.yml @@ -0,0 +1,2 @@ +exclude_paths: +- "resources/lang/**" \ No newline at end of file From 07ecb3f0e8f69037826bfeb5520cfcefff205d5c Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 17:23:56 +0100 Subject: [PATCH 115/276] Expand code climate config [skip ci] --- .codeclimate.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.codeclimate.yml b/.codeclimate.yml index c521815c72..09a13940ca 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -1,2 +1,15 @@ +engines: + csslint: + enabled: true + duplication: + enabled: true + eslint: + enabled: true + fixme: + enabled: true + phpcodesniffer: + enabled: true + phpmd: + enabled: true exclude_paths: - "resources/lang/**" \ No newline at end of file From e8f76d896b7e1893a3fbd5370daa1e65fbe538f1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 17:25:36 +0100 Subject: [PATCH 116/276] Expand code climate config [skip ci] --- .codeclimate.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.codeclimate.yml b/.codeclimate.yml index 09a13940ca..56c3c3b858 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -3,6 +3,10 @@ engines: enabled: true duplication: enabled: true + config: + languages: + - php + - javascript eslint: enabled: true fixme: From ae06f1b8f011ea03f516b257c6f5d5190828afb8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 18:16:07 +0100 Subject: [PATCH 117/276] Yeah never mind. [skip ci] --- .codeclimate.yml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 .codeclimate.yml diff --git a/.codeclimate.yml b/.codeclimate.yml deleted file mode 100644 index 56c3c3b858..0000000000 --- a/.codeclimate.yml +++ /dev/null @@ -1,19 +0,0 @@ -engines: - csslint: - enabled: true - duplication: - enabled: true - config: - languages: - - php - - javascript - eslint: - enabled: true - fixme: - enabled: true - phpcodesniffer: - enabled: true - phpmd: - enabled: true -exclude_paths: -- "resources/lang/**" \ No newline at end of file From a5f8aa914f29e4c31d7e1226506878784a94971a Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 20:07:10 +0100 Subject: [PATCH 118/276] Build code for tag report. --- .../Report/Budget/MonthReportGenerator.php | 10 +++ .../Report/Category/MonthReportGenerator.php | 10 +++ .../Report/ReportGeneratorInterface.php | 7 ++ .../Report/Standard/MonthReportGenerator.php | 10 +++ .../Standard/MultiYearReportGenerator.php | 10 +++ .../Report/Standard/YearReportGenerator.php | 10 +++ app/Http/Controllers/ReportController.php | 69 +++++++++++++++++++ app/Http/Requests/ReportFormRequest.php | 24 ++++++- app/Support/Binder/TagList.php | 52 ++++++++++++++ config/firefly.php | 3 +- public/js/ff/reports/index.js | 62 +++++++---------- resources/lang/en_US/firefly.php | 9 ++- resources/views/reports/index.twig | 1 + resources/views/reports/options/budget.twig | 18 ++--- resources/views/reports/options/category.twig | 19 ++--- resources/views/reports/options/tag.twig | 10 +++ routes/web.php | 1 + 17 files changed, 265 insertions(+), 60 deletions(-) create mode 100644 app/Support/Binder/TagList.php create mode 100644 resources/views/reports/options/tag.twig diff --git a/app/Generator/Report/Budget/MonthReportGenerator.php b/app/Generator/Report/Budget/MonthReportGenerator.php index d3166ead4e..87557c8682 100644 --- a/app/Generator/Report/Budget/MonthReportGenerator.php +++ b/app/Generator/Report/Budget/MonthReportGenerator.php @@ -131,6 +131,16 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface return $this; } + /** + * @param Collection $tags + * + * @return ReportGeneratorInterface + */ + public function setTags(Collection $tags): ReportGeneratorInterface + { + return $this; + } + /** * @param Collection $collection * @param int $sortFlag diff --git a/app/Generator/Report/Category/MonthReportGenerator.php b/app/Generator/Report/Category/MonthReportGenerator.php index d137b6e8b5..0a3c60be3a 100644 --- a/app/Generator/Report/Category/MonthReportGenerator.php +++ b/app/Generator/Report/Category/MonthReportGenerator.php @@ -141,6 +141,16 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface return $this; } + /** + * @param Collection $tags + * + * @return ReportGeneratorInterface + */ + public function setTags(Collection $tags): ReportGeneratorInterface + { + return $this; + } + /** * @param Collection $collection * @param int $sortFlag diff --git a/app/Generator/Report/ReportGeneratorInterface.php b/app/Generator/Report/ReportGeneratorInterface.php index 593d318f10..12942190f4 100644 --- a/app/Generator/Report/ReportGeneratorInterface.php +++ b/app/Generator/Report/ReportGeneratorInterface.php @@ -64,4 +64,11 @@ interface ReportGeneratorInterface */ public function setStartDate(Carbon $date): ReportGeneratorInterface; + /** + * @param Collection $tags + * + * @return ReportGeneratorInterface + */ + public function setTags(Collection $tags): ReportGeneratorInterface; + } diff --git a/app/Generator/Report/Standard/MonthReportGenerator.php b/app/Generator/Report/Standard/MonthReportGenerator.php index 113b777c91..bf4d1889ca 100644 --- a/app/Generator/Report/Standard/MonthReportGenerator.php +++ b/app/Generator/Report/Standard/MonthReportGenerator.php @@ -106,4 +106,14 @@ class MonthReportGenerator implements ReportGeneratorInterface return $this; } + + /** + * @param Collection $tags + * + * @return ReportGeneratorInterface + */ + public function setTags(Collection $tags): ReportGeneratorInterface + { + return $this; + } } diff --git a/app/Generator/Report/Standard/MultiYearReportGenerator.php b/app/Generator/Report/Standard/MultiYearReportGenerator.php index 5dab371d6b..a5b1702a95 100644 --- a/app/Generator/Report/Standard/MultiYearReportGenerator.php +++ b/app/Generator/Report/Standard/MultiYearReportGenerator.php @@ -103,4 +103,14 @@ class MultiYearReportGenerator implements ReportGeneratorInterface return $this; } + + /** + * @param Collection $tags + * + * @return ReportGeneratorInterface + */ + public function setTags(Collection $tags): ReportGeneratorInterface + { + return $this; + } } diff --git a/app/Generator/Report/Standard/YearReportGenerator.php b/app/Generator/Report/Standard/YearReportGenerator.php index f3297e35df..e755b45057 100644 --- a/app/Generator/Report/Standard/YearReportGenerator.php +++ b/app/Generator/Report/Standard/YearReportGenerator.php @@ -103,4 +103,14 @@ class YearReportGenerator implements ReportGeneratorInterface return $this; } + + /** + * @param Collection $tags + * + * @return ReportGeneratorInterface + */ + public function setTags(Collection $tags): ReportGeneratorInterface + { + return $this; + } } diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index e2348dc6d8..5c32e086f9 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -19,9 +19,11 @@ use FireflyIII\Generator\Report\ReportGeneratorFactory; use FireflyIII\Helpers\Report\ReportHelperInterface; use FireflyIII\Http\Requests\ReportFormRequest; use FireflyIII\Models\AccountType; +use FireflyIII\Models\Tag; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; +use FireflyIII\Repositories\Tag\TagRepositoryInterface; use Illuminate\Http\RedirectResponse; use Illuminate\Support\Collection; use Preferences; @@ -96,6 +98,42 @@ class ReportController extends Controller } + /** + * @param Collection $accounts + * @param Collection $tags + * @param Carbon $start + * @param Carbon $end + * + * @return string + */ + public function tagReport(Collection $accounts, Collection $tags, Carbon $start, Carbon $end) + { + if ($end < $start) { + return view('error')->with('message', trans('firefly.end_after_start_date')); + } + if ($start < session('first')) { + $start = session('first'); + } + + View::share( + 'subTitle', trans( + 'firefly.report_tag', + [ + 'start' => $start->formatLocalized($this->monthFormat), + 'end' => $end->formatLocalized($this->monthFormat), + ] + ) + ); + + $generator = ReportGeneratorFactory::reportGenerator('Tag', $start, $end); + $generator->setAccounts($accounts); + $generator->setTags($tags); + $result = $generator->generate(); + + return $result; + + } + /** * @param Collection $accounts * @param Collection $budgets @@ -238,6 +276,9 @@ class ReportController extends Controller case 'budget': $result = $this->budgetReportOptions(); break; + case 'tag': + $result = $this->tagReportOptions(); + break; } return Response::json(['html' => $result]); @@ -258,6 +299,7 @@ class ReportController extends Controller $accounts = join(',', $request->getAccountList()->pluck('id')->toArray()); $categories = join(',', $request->getCategoryList()->pluck('id')->toArray()); $budgets = join(',', $request->getBudgetList()->pluck('id')->toArray()); + $tags = join(',', $request->getTagList()->pluck('tag')->toArray()); if ($request->getAccountList()->count() === 0) { Session::flash('error', trans('firefly.select_more_than_one_account')); @@ -277,6 +319,12 @@ class ReportController extends Controller return redirect(route('reports.index')); } + if ($request->getTagList()->count() === 0 && $reportType === 'tag') { + Session::flash('error', trans('firefly.select_more_than_one_tag')); + + return redirect(route('reports.index')); + } + if ($end < $start) { return view('error')->with('message', trans('firefly.end_after_start_date')); } @@ -301,6 +349,9 @@ class ReportController extends Controller case 'budget': $uri = route('reports.report.budget', [$accounts, $budgets, $start, $end]); break; + case 'tag': + $uri = route('reports.report.tag', [$accounts, $tags, $start, $end]); + break; } return redirect($uri); @@ -341,4 +392,22 @@ class ReportController extends Controller { return view('reports.options.no-options')->render(); } + + /** + * @return string + */ + private function tagReportOptions(): string + { + /** @var TagRepositoryInterface $repository */ + $repository = app(TagRepositoryInterface::class); + $tags = $repository->get()->sortBy( + function (Tag $tag) { + return $tag->tag; + } + ); + $result = view('reports.options.tag', compact('tags'))->render(); + + return $result; + + } } diff --git a/app/Http/Requests/ReportFormRequest.php b/app/Http/Requests/ReportFormRequest.php index 763af9dd6a..02a5f5c8e5 100644 --- a/app/Http/Requests/ReportFormRequest.php +++ b/app/Http/Requests/ReportFormRequest.php @@ -19,6 +19,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; +use FireflyIII\Repositories\Tag\TagRepositoryInterface; use Illuminate\Support\Collection; /** @@ -141,13 +142,34 @@ class ReportFormRequest extends Request return $date; } + /** + * @return Collection + */ + public function getTagList(): Collection + { + /** @var TagRepositoryInterface $repository */ + $repository = app(TagRepositoryInterface::class); + $set = $this->get('tag'); + $collection = new Collection; + if (is_array($set)) { + foreach ($set as $tagTag) { + $tag = $repository->findByTag($tagTag); + if (!is_null($tag->id)) { + $collection->push($tag); + } + } + } + + return $collection; + } + /** * @return array */ public function rules(): array { return [ - 'report_type' => 'in:audit,default,category,budget', + 'report_type' => 'in:audit,default,category,budget,tag', ]; } diff --git a/app/Support/Binder/TagList.php b/app/Support/Binder/TagList.php new file mode 100644 index 0000000000..b1c42bb4c8 --- /dev/null +++ b/app/Support/Binder/TagList.php @@ -0,0 +1,52 @@ +check()) { + $tags = explode(',', $value); + /** @var TagRepositoryInterface $repository */ + $repository = app(TagRepositoryInterface::class); + $allTags = $repository->get(); + $set = $allTags->filter( + function (Tag $tag) use ($tags) { + return in_array($tag->tag, $tags); + } + ); + + if ($set->count() > 0) { + return $set; + } + } + throw new NotFoundHttpException; + } +} diff --git a/config/firefly.php b/config/firefly.php index adae9e8c07..5ffebe0c43 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -153,6 +153,7 @@ return [ 'budgetList' => 'FireflyIII\Support\Binder\BudgetList', 'journalList' => 'FireflyIII\Support\Binder\JournalList', 'categoryList' => 'FireflyIII\Support\Binder\CategoryList', + 'tagList' => 'FireflyIII\Support\Binder\TagList', 'start_date' => 'FireflyIII\Support\Binder\Date', 'end_date' => 'FireflyIII\Support\Binder\Date', ], @@ -176,7 +177,7 @@ return [ 'transaction_type' => 'FireflyIII\Rules\Triggers\TransactionType', 'category_is' => 'FireflyIII\Rules\Triggers\CategoryIs', 'budget_is' => 'FireflyIII\Rules\Triggers\BudgetIs', - 'tag_is' => 'FireflyIII\Rules\Triggers\TagIs', + 'tag_is' => 'FireflyIII\Rules\Triggers\TagIs', ], 'rule-actions' => [ 'set_category' => 'FireflyIII\Rules\Actions\SetCategory', diff --git a/public/js/ff/reports/index.js b/public/js/ff/reports/index.js index b57faf8b04..df65b9704f 100644 --- a/public/js/ff/reports/index.js +++ b/public/js/ff/reports/index.js @@ -98,8 +98,8 @@ function setOptionalFromCookies() { arr.forEach(function (val) { $('#inputCategories').find('option[value="' + val + '"]').prop('selected', true); }); - $('#inputCategories').multiselect(defaultMultiSelect); } + $('#inputCategories').multiselect(defaultMultiSelect); // and budgets! if ((readCookie('report-budgets') !== null)) { @@ -107,8 +107,17 @@ function setOptionalFromCookies() { arr.forEach(function (val) { $('#inputBudgets').find('option[value="' + val + '"]').prop('selected', true); }); - $('#inputBudgets').multiselect(defaultMultiSelect); } + $('#inputBudgets').multiselect(defaultMultiSelect); + + // and tags! + if ((readCookie('report-tags') !== null)) { + arr = readCookie('report-tags').split(','); + arr.forEach(function (val) { + $('#inputBudgets').find('option[value="' + val + '"]').prop('selected', true); + }); + } + $('#inputTags').multiselect(defaultMultiSelect); } function catchSubmit() { @@ -117,45 +126,20 @@ function catchSubmit() { var picker = $('#inputDateRange').data('daterangepicker'); // all account ids: - var count = 0; - var accounts = []; - $.each($('.account-checkbox'), function (i, v) { - var c = $(v); - if (c.prop('checked')) { - accounts.push(c.val()); - count++; - } - }); - - // all category ids: - var categories = []; - $.each($('.category-checkbox'), function (i, v) { - var c = $(v); - if (c.prop('checked')) { - categories.push(c.val()); - } - }); - - // all budget ids: - var budgets = []; - $.each($('.budget-checkbox'), function (i, v) { - var c = $(v); - if (c.prop('checked')) { - budgets.push(c.val()); - } - }); - + var accounts = $('#inputAccounts').val(); + var categories = $('#inputCategories').val(); + var budgets = $('#inputBudgets').val(); + var tags = $('#inputTags').val(); // remember all - if (count > 0) { - // set cookie to remember choices. - createCookie('report-type', $('select[name="report_type"]').val(), 365); - createCookie('report-accounts', accounts, 365); - createCookie('report-categories', categories, 365); - createCookie('report-budgets', budgets, 365); - createCookie('report-start', moment(picker.startDate).format("YYYYMMDD"), 365); - createCookie('report-end', moment(picker.endDate).format("YYYYMMDD"), 365); - } + // set cookie to remember choices. + createCookie('report-type', $('select[name="report_type"]').val(), 365); + createCookie('report-accounts', accounts, 365); + createCookie('report-categories', categories, 365); + createCookie('report-budgets', budgets, 365); + createCookie('report-tags', tags, 365); + createCookie('report-start', moment(picker.startDate).format("YYYYMMDD"), 365); + createCookie('report-end', moment(picker.endDate).format("YYYYMMDD"), 365); return true; } diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 5bc5ae351d..23d501fdb0 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -554,6 +554,7 @@ return [ 'select_more_than_one_account' => 'Please select more than one account', 'select_more_than_one_category' => 'Please select more than one category', 'select_more_than_one_budget' => 'Please select more than one budget', + 'select_more_than_one_tag' => 'Please select more than one tag', 'from_to' => 'From :start to :end', // categories: @@ -711,6 +712,7 @@ return [ 'report_type_audit' => 'Transaction history overview (audit)', 'report_type_category' => 'Category report', 'report_type_budget' => 'Budget report', + 'report_type_tag' => 'Tag report', 'report_type_meta-history' => 'Categories, budgets and bills overview', 'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.', 'report_included_accounts' => 'Included accounts', @@ -729,8 +731,9 @@ return [ 'report_has_no_extra_options' => 'This report has no extra options', 'reports_submit' => 'View report', 'end_after_start_date' => 'End date of report must be after start date.', - 'select_category' => 'Select one or more categories.', - 'select_budget' => 'Select one or more budgets.', + 'select_category' => 'Select category(ies)', + 'select_budget' => 'Select budget(s).', + 'select_tag' => 'Select tag(s).', 'income_per_category' => 'Income per category', 'expense_per_category' => 'Expense per category', 'expense_per_budget' => 'Expense per budget', @@ -961,5 +964,5 @@ return [ 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', // sandstorm.io errors and messages: - 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; diff --git a/resources/views/reports/index.twig b/resources/views/reports/index.twig index 85771558c0..d46984b7ea 100644 --- a/resources/views/reports/index.twig +++ b/resources/views/reports/index.twig @@ -28,6 +28,7 @@ +
                                                                                                                                                                                              diff --git a/resources/views/reports/options/budget.twig b/resources/views/reports/options/budget.twig index 85d9bac773..ee85764b89 100644 --- a/resources/views/reports/options/budget.twig +++ b/resources/views/reports/options/budget.twig @@ -1,8 +1,10 @@ -

                                                                                                                                                                                              - {{ 'select_budget'|_ }} -

                                                                                                                                                                                              - +
                                                                                                                                                                                              + +
                                                                                                                                                                                              + +
                                                                                                                                                                                              +
                                                                                                                                                                                              \ No newline at end of file diff --git a/resources/views/reports/options/category.twig b/resources/views/reports/options/category.twig index 665e60421e..2ff52d301a 100644 --- a/resources/views/reports/options/category.twig +++ b/resources/views/reports/options/category.twig @@ -1,8 +1,11 @@ -

                                                                                                                                                                                              - {{ 'select_category'|_ }} -

                                                                                                                                                                                              - +
                                                                                                                                                                                              + +
                                                                                                                                                                                              + + +
                                                                                                                                                                                              +
                                                                                                                                                                                              diff --git a/resources/views/reports/options/tag.twig b/resources/views/reports/options/tag.twig new file mode 100644 index 0000000000..54d4663a0d --- /dev/null +++ b/resources/views/reports/options/tag.twig @@ -0,0 +1,10 @@ +
                                                                                                                                                                                              + +
                                                                                                                                                                                              + +
                                                                                                                                                                                              +
                                                                                                                                                                                              diff --git a/routes/web.php b/routes/web.php index 1210b72f1a..c446a58ff9 100755 --- a/routes/web.php +++ b/routes/web.php @@ -478,6 +478,7 @@ Route::group( Route::get('audit/{accountList}/{start_date}/{end_date}', ['uses' => 'ReportController@auditReport', 'as' => 'report.audit']); Route::get('category/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'ReportController@categoryReport', 'as' => 'report.category']); Route::get('budget/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'ReportController@budgetReport', 'as' => 'report.budget']); + Route::get('tag/{accountList}/{tagList}/{start_date}/{end_date}', ['uses' => 'ReportController@tagReport', 'as' => 'report.tag']); Route::post('', ['uses' => 'ReportController@postIndex', 'as' => 'index.post']); } From ec9ddb2bfbbc6f9b45c812c8b050af42edbc812f Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 20:10:27 +0100 Subject: [PATCH 119/276] New translations --- resources/lang/pt_BR/firefly.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index 12f18175b6..937736cb82 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -554,6 +554,7 @@ return [ 'select_more_than_one_account' => 'Por favor, selecione mais de uma conta', 'select_more_than_one_category' => 'Por favor, selecione mais de uma categoria', 'select_more_than_one_budget' => 'Please select more than one budget', + 'select_more_than_one_tag' => 'Please select more than one tag', 'from_to' => 'From :start to :end', // categories: @@ -711,6 +712,7 @@ return [ 'report_type_audit' => 'Visão geral do histórico de transação (auditoria)', 'report_type_category' => 'Relatório por Categorias', 'report_type_budget' => 'Budget report', + 'report_type_tag' => 'Tag report', 'report_type_meta-history' => 'Visão geral de categorias, orçamentos e faturas', 'more_info_help' => 'Mais informações sobre esses tipos de relatórios podem ser encontradas nas páginas de ajuda. Pressione o ícone (?) no canto superior direito.', 'report_included_accounts' => 'Contas incluídas', @@ -729,8 +731,9 @@ return [ 'report_has_no_extra_options' => 'Este relatório não tem mais opções', 'reports_submit' => 'Visualizar relatório', 'end_after_start_date' => 'Data de término do relatório deve ser depois da data de início.', - 'select_category' => 'Selecione uma ou mais categorias.', - 'select_budget' => 'Select one or more budgets.', + 'select_category' => 'Select category(ies)', + 'select_budget' => 'Select budget(s).', + 'select_tag' => 'Select tag(s).', 'income_per_category' => 'Receitas por categoria', 'expense_per_category' => 'Despesa por categoria', 'expense_per_budget' => 'Expense per budget', @@ -961,5 +964,5 @@ return [ 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', // sandstorm.io errors and messages: - 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From 684d1dc43207db2f047cfe7ead319c93791ed2db Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 20:10:33 +0100 Subject: [PATCH 120/276] New translations --- resources/lang/pl_PL/firefly.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php index ff44553b96..9764696d31 100644 --- a/resources/lang/pl_PL/firefly.php +++ b/resources/lang/pl_PL/firefly.php @@ -554,6 +554,7 @@ return [ 'select_more_than_one_account' => 'Proszę wybierz więcej niż jedno konto', 'select_more_than_one_category' => 'Proszę wybierz więcej niż jedną kategorię', 'select_more_than_one_budget' => 'Proszę wybierz więcej niż jeden budżet', + 'select_more_than_one_tag' => 'Please select more than one tag', 'from_to' => 'Od :start do :end', // categories: @@ -711,6 +712,7 @@ return [ 'report_type_audit' => 'Przegląd historii transakcji (audyt)', 'report_type_category' => 'Raport kategorii', 'report_type_budget' => 'Raport budżetów', + 'report_type_tag' => 'Tag report', 'report_type_meta-history' => 'Przegląd kategorii, budżetów i rachunków', 'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.', 'report_included_accounts' => 'Uwzględnione konta', @@ -729,8 +731,9 @@ return [ 'report_has_no_extra_options' => 'Ten raport nie ma dodatkowych opcji', 'reports_submit' => 'Zobacz raport', 'end_after_start_date' => 'Data zakończenia raportu musi być po dacie rozpoczęcia.', - 'select_category' => 'Wybierz jedną lub więcej kategorii.', - 'select_budget' => 'Wybierz jeden lub więcej budżetów.', + 'select_category' => 'Select category(ies)', + 'select_budget' => 'Select budget(s).', + 'select_tag' => 'Select tag(s).', 'income_per_category' => 'Dochód wg kategorii', 'expense_per_category' => 'Wydatek wg kategorii', 'expense_per_budget' => 'Wydatek wg budżetu', @@ -961,5 +964,5 @@ return [ 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', // sandstorm.io errors and messages: - 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From 770e77a86262769a3480dadae4d9dd8905409956 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 20:10:41 +0100 Subject: [PATCH 121/276] New translations --- resources/lang/de_DE/firefly.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index 78ec1ae556..e252b619b8 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -555,6 +555,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', 'select_more_than_one_account' => 'Bitte mehr als ein Konto wählen', 'select_more_than_one_category' => 'Bitte mehr als eine Kategorie wählen', 'select_more_than_one_budget' => 'Bitte mehr als ein Budget wählen', + 'select_more_than_one_tag' => 'Please select more than one tag', 'from_to' => 'Von :start bis :end', // categories: @@ -712,6 +713,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', 'report_type_audit' => 'Übersicht der Transaktionen (Prüfung)', 'report_type_category' => 'Kategorie-Bericht', 'report_type_budget' => 'Budgetbericht', + 'report_type_tag' => 'Tag report', 'report_type_meta-history' => 'Übersicht über Kategorien, Budgets und Rechnungen', 'more_info_help' => 'Weitere Informationen über diese Art von Berichten finden Sie in der Hilfe. Drücken Sie hierfür das (?)-Symbol in der oberen rechten Ecke.', 'report_included_accounts' => 'Eingezogene Konten', @@ -730,8 +732,9 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', 'report_has_no_extra_options' => 'Dieser Bericht hat keine zusätzliche Optionen', 'reports_submit' => 'Zeige Bericht', 'end_after_start_date' => 'Enddatum des Berichts muss nach dem Startdatum liegen.', - 'select_category' => 'Wählen Sie eine oder mehrere Kategorien aus.', - 'select_budget' => 'Wählen Sie ein oder mehrere Budgets aus.', + 'select_category' => 'Select category(ies)', + 'select_budget' => 'Select budget(s).', + 'select_tag' => 'Select tag(s).', 'income_per_category' => 'Einnahmen pro Kategorie', 'expense_per_category' => 'Ausgaben pro Kategorie', 'expense_per_budget' => 'Ausgaben pro Budget', @@ -962,5 +965,5 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', // sandstorm.io errors and messages: - 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From f4afcd29e05753eb5955ea6d4efd0a265a7af9c1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 20:10:56 +0100 Subject: [PATCH 122/276] New translations --- resources/lang/es_ES/firefly.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index d12ae69331..072b74239a 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -554,6 +554,7 @@ return [ 'select_more_than_one_account' => 'Please select more than one account', 'select_more_than_one_category' => 'Please select more than one category', 'select_more_than_one_budget' => 'Please select more than one budget', + 'select_more_than_one_tag' => 'Please select more than one tag', 'from_to' => 'From :start to :end', // categories: @@ -711,6 +712,7 @@ return [ 'report_type_audit' => 'Transaction history overview (audit)', 'report_type_category' => 'Category report', 'report_type_budget' => 'Budget report', + 'report_type_tag' => 'Tag report', 'report_type_meta-history' => 'Categories, budgets and bills overview', 'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.', 'report_included_accounts' => 'Included accounts', @@ -729,8 +731,9 @@ return [ 'report_has_no_extra_options' => 'This report has no extra options', 'reports_submit' => 'View report', 'end_after_start_date' => 'End date of report must be after start date.', - 'select_category' => 'Select one or more categories.', - 'select_budget' => 'Select one or more budgets.', + 'select_category' => 'Select category(ies)', + 'select_budget' => 'Select budget(s).', + 'select_tag' => 'Select tag(s).', 'income_per_category' => 'Income per category', 'expense_per_category' => 'Expense per category', 'expense_per_budget' => 'Expense per budget', @@ -961,5 +964,5 @@ return [ 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', // sandstorm.io errors and messages: - 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From c15bee4511cd84b450aa4437ef0ac1c2a70401d0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 20:11:05 +0100 Subject: [PATCH 123/276] New translations --- resources/lang/nl_NL/firefly.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 5dcca84c28..be0a94260f 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -554,6 +554,7 @@ return [ 'select_more_than_one_account' => 'Selecteer meer dan één rekening', 'select_more_than_one_category' => 'Selecteer meer dan één categorie', 'select_more_than_one_budget' => 'Selecteer meer dan één budget', + 'select_more_than_one_tag' => 'Please select more than one tag', 'from_to' => 'Van :start tot en met :end', // categories: @@ -711,6 +712,7 @@ return [ 'report_type_audit' => 'Transactiehistorie-overzicht (audit)', 'report_type_category' => 'Categorierapport', 'report_type_budget' => 'Budgetrapport', + 'report_type_tag' => 'Tag report', 'report_type_meta-history' => 'Overzicht van categorieën, budgetten en contracten', 'more_info_help' => 'Meer informatie over deze rapporten vind je in de hulppagina\'s. Klik daarvoor op het (?) icoontje rechtsboven.', 'report_included_accounts' => 'Accounts in rapport', @@ -729,8 +731,9 @@ return [ 'report_has_no_extra_options' => 'Er zijn geen extra opties voor dit overzicht', 'reports_submit' => 'Bekijk overzicht', 'end_after_start_date' => 'Einddatum moet na begindatum liggen.', - 'select_category' => 'Selecteer minstens één categorie.', - 'select_budget' => 'Selecteer minstens één budget.', + 'select_category' => 'Select category(ies)', + 'select_budget' => 'Select budget(s).', + 'select_tag' => 'Select tag(s).', 'income_per_category' => 'Inkomen per categorie', 'expense_per_category' => 'Uitgaven per categorie', 'expense_per_budget' => 'Uitgaven per budget', @@ -961,5 +964,5 @@ return [ 'import_finished_text_with_link' => 'Je kan je geïmporteerde transacties op deze pagina terug vinden.', // sandstorm.io errors and messages: - 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From 4a2b7cfc4e3eae90b21a655972001ccab9b3dc89 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 20:11:15 +0100 Subject: [PATCH 124/276] New translations --- resources/lang/ru_RU/firefly.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php index d12ae69331..072b74239a 100644 --- a/resources/lang/ru_RU/firefly.php +++ b/resources/lang/ru_RU/firefly.php @@ -554,6 +554,7 @@ return [ 'select_more_than_one_account' => 'Please select more than one account', 'select_more_than_one_category' => 'Please select more than one category', 'select_more_than_one_budget' => 'Please select more than one budget', + 'select_more_than_one_tag' => 'Please select more than one tag', 'from_to' => 'From :start to :end', // categories: @@ -711,6 +712,7 @@ return [ 'report_type_audit' => 'Transaction history overview (audit)', 'report_type_category' => 'Category report', 'report_type_budget' => 'Budget report', + 'report_type_tag' => 'Tag report', 'report_type_meta-history' => 'Categories, budgets and bills overview', 'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.', 'report_included_accounts' => 'Included accounts', @@ -729,8 +731,9 @@ return [ 'report_has_no_extra_options' => 'This report has no extra options', 'reports_submit' => 'View report', 'end_after_start_date' => 'End date of report must be after start date.', - 'select_category' => 'Select one or more categories.', - 'select_budget' => 'Select one or more budgets.', + 'select_category' => 'Select category(ies)', + 'select_budget' => 'Select budget(s).', + 'select_tag' => 'Select tag(s).', 'income_per_category' => 'Income per category', 'expense_per_category' => 'Expense per category', 'expense_per_budget' => 'Expense per budget', @@ -961,5 +964,5 @@ return [ 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', // sandstorm.io errors and messages: - 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From 3d9e723a0ec4626424834e64cebcbe4cc5aa8797 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 20:11:33 +0100 Subject: [PATCH 125/276] New translations --- resources/lang/zh_HK/firefly.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php index d12ae69331..072b74239a 100644 --- a/resources/lang/zh_HK/firefly.php +++ b/resources/lang/zh_HK/firefly.php @@ -554,6 +554,7 @@ return [ 'select_more_than_one_account' => 'Please select more than one account', 'select_more_than_one_category' => 'Please select more than one category', 'select_more_than_one_budget' => 'Please select more than one budget', + 'select_more_than_one_tag' => 'Please select more than one tag', 'from_to' => 'From :start to :end', // categories: @@ -711,6 +712,7 @@ return [ 'report_type_audit' => 'Transaction history overview (audit)', 'report_type_category' => 'Category report', 'report_type_budget' => 'Budget report', + 'report_type_tag' => 'Tag report', 'report_type_meta-history' => 'Categories, budgets and bills overview', 'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.', 'report_included_accounts' => 'Included accounts', @@ -729,8 +731,9 @@ return [ 'report_has_no_extra_options' => 'This report has no extra options', 'reports_submit' => 'View report', 'end_after_start_date' => 'End date of report must be after start date.', - 'select_category' => 'Select one or more categories.', - 'select_budget' => 'Select one or more budgets.', + 'select_category' => 'Select category(ies)', + 'select_budget' => 'Select budget(s).', + 'select_tag' => 'Select tag(s).', 'income_per_category' => 'Income per category', 'expense_per_category' => 'Expense per category', 'expense_per_budget' => 'Expense per budget', @@ -961,5 +964,5 @@ return [ 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', // sandstorm.io errors and messages: - 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From 623cd51b1cc560bfb5b54da50fb378f0f1b6e2e5 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 20:11:39 +0100 Subject: [PATCH 126/276] New translations --- resources/lang/hr_HR/firefly.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php index d12ae69331..072b74239a 100644 --- a/resources/lang/hr_HR/firefly.php +++ b/resources/lang/hr_HR/firefly.php @@ -554,6 +554,7 @@ return [ 'select_more_than_one_account' => 'Please select more than one account', 'select_more_than_one_category' => 'Please select more than one category', 'select_more_than_one_budget' => 'Please select more than one budget', + 'select_more_than_one_tag' => 'Please select more than one tag', 'from_to' => 'From :start to :end', // categories: @@ -711,6 +712,7 @@ return [ 'report_type_audit' => 'Transaction history overview (audit)', 'report_type_category' => 'Category report', 'report_type_budget' => 'Budget report', + 'report_type_tag' => 'Tag report', 'report_type_meta-history' => 'Categories, budgets and bills overview', 'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.', 'report_included_accounts' => 'Included accounts', @@ -729,8 +731,9 @@ return [ 'report_has_no_extra_options' => 'This report has no extra options', 'reports_submit' => 'View report', 'end_after_start_date' => 'End date of report must be after start date.', - 'select_category' => 'Select one or more categories.', - 'select_budget' => 'Select one or more budgets.', + 'select_category' => 'Select category(ies)', + 'select_budget' => 'Select budget(s).', + 'select_tag' => 'Select tag(s).', 'income_per_category' => 'Income per category', 'expense_per_category' => 'Expense per category', 'expense_per_budget' => 'Expense per budget', @@ -961,5 +964,5 @@ return [ 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', // sandstorm.io errors and messages: - 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From 6dfa027ae21076648dd738c5e9c2b39dd39ec844 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 20:11:48 +0100 Subject: [PATCH 127/276] New translations --- resources/lang/zh_TW/firefly.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index 6302fbb8a7..0f9c24a42c 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -554,6 +554,7 @@ return [ 'select_more_than_one_account' => 'Please select more than one account', 'select_more_than_one_category' => 'Please select more than one category', 'select_more_than_one_budget' => 'Please select more than one budget', + 'select_more_than_one_tag' => 'Please select more than one tag', 'from_to' => 'From :start to :end', // categories: @@ -711,6 +712,7 @@ return [ 'report_type_audit' => 'Transaction history overview (audit)', 'report_type_category' => 'Category report', 'report_type_budget' => 'Budget report', + 'report_type_tag' => 'Tag report', 'report_type_meta-history' => '類別、 預算與賬單的概覽', 'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.', 'report_included_accounts' => 'Included accounts', @@ -729,8 +731,9 @@ return [ 'report_has_no_extra_options' => 'This report has no extra options', 'reports_submit' => 'View report', 'end_after_start_date' => 'End date of report must be after start date.', - 'select_category' => 'Select one or more categories.', - 'select_budget' => 'Select one or more budgets.', + 'select_category' => 'Select category(ies)', + 'select_budget' => 'Select budget(s).', + 'select_tag' => 'Select tag(s).', 'income_per_category' => 'Income per category', 'expense_per_category' => 'Expense per category', 'expense_per_budget' => 'Expense per budget', @@ -961,5 +964,5 @@ return [ 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', // sandstorm.io errors and messages: - 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From 281e3f706bb450f3696933c23fa0ec6695274df6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 20:12:02 +0100 Subject: [PATCH 128/276] New translations --- resources/lang/fr_FR/firefly.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index d82f7d3160..5abaa03d71 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -554,6 +554,7 @@ return [ 'select_more_than_one_account' => 'Please select more than one account', 'select_more_than_one_category' => 'Please select more than one category', 'select_more_than_one_budget' => 'Please select more than one budget', + 'select_more_than_one_tag' => 'Please select more than one tag', 'from_to' => 'From :start to :end', // categories: @@ -711,6 +712,7 @@ return [ 'report_type_audit' => 'Historique des transactions', 'report_type_category' => 'Category report', 'report_type_budget' => 'Budget report', + 'report_type_tag' => 'Tag report', 'report_type_meta-history' => 'Vue d’ensemble des budgets, des catégories et des factures', 'more_info_help' => 'Plus d’informations sur ces types de rapports se trouvent dans les pages d’aide. Appuyez sur l’icône ( ?) dans le coin supérieur droit.', 'report_included_accounts' => 'Comptes inclus', @@ -729,8 +731,9 @@ return [ 'report_has_no_extra_options' => 'This report has no extra options', 'reports_submit' => 'View report', 'end_after_start_date' => 'End date of report must be after start date.', - 'select_category' => 'Select one or more categories.', - 'select_budget' => 'Select one or more budgets.', + 'select_category' => 'Select category(ies)', + 'select_budget' => 'Select budget(s).', + 'select_tag' => 'Select tag(s).', 'income_per_category' => 'Income per category', 'expense_per_category' => 'Expense per category', 'expense_per_budget' => 'Expense per budget', @@ -961,5 +964,5 @@ return [ 'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the tag that was created for this import.', // sandstorm.io errors and messages: - 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', + 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', ]; \ No newline at end of file From 8f5289b7dc5db89961805f4abd3f22107c9a7108 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 21:55:50 +0100 Subject: [PATCH 129/276] Fixed some transaction list filter issues. --- app/Helpers/Collector/JournalCollector.php | 14 +++++---- .../Controllers/TransactionController.php | 31 ++++++------------- app/Support/Twig/General.php | 15 +++++++++ resources/views/list/journals-tasker.twig | 21 ++++++++++--- 4 files changed, 48 insertions(+), 33 deletions(-) diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php index f1de985b9e..945f604f6c 100644 --- a/app/Helpers/Collector/JournalCollector.php +++ b/app/Helpers/Collector/JournalCollector.php @@ -506,6 +506,7 @@ class JournalCollector implements JournalCollectorInterface { $this->joinOpposingTables(); + /** $accountIds = $this->accountIds; $this->query->where( function (EloquentBuilder $q1) use ($accountIds) { @@ -535,6 +536,7 @@ class JournalCollector implements JournalCollectorInterface ); } ); + * **/ return $this; } @@ -637,12 +639,12 @@ class JournalCollector implements JournalCollectorInterface continue; } // make property string: - $journalId = $transaction->transaction_journal_id; - $amount = Steam::positive($transaction->transaction_amount); - $source = $transaction->account_id; - $dest = $transaction->opposing_account_id; - $key = $journalId . $source . $dest . $amount; - + $journalId = $transaction->transaction_journal_id; + $amount = Steam::positive($transaction->transaction_amount); + $accountIds = [intval($transaction->account_id), intval($transaction->opposing_account_id)]; + sort($accountIds); + $key = $journalId . '-' . join(',', $accountIds) . '-' . $amount; + Log::debug(sprintf('Key is %s', $key)); if (!isset($count[$key])) { // not yet counted? add to new set and count it: $new->push($transaction); diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 3557144c94..b0ef6013ab 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -73,15 +73,10 @@ class TransactionController extends Controller /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setTypes($types)->setLimit($pageSize)->setPage($page)->setAllAssetAccounts(); - $collector->setRange($start, $end)->withBudgetInformation()->withCategoryInformation(); - - // do not filter transfers if $what = transfer. - if (!in_array($what, ['transfer', 'transfers'])) { - Log::debug('Also get opposing account info.'); - $collector->withOpposingAccount(); - } - + $collector->setTypes($types)->setLimit($pageSize)->setPage($page)->setAllAssetAccounts()->setRange($start, $end)->withBudgetInformation() + ->withCategoryInformation(); + $collector->withOpposingAccount(); + $collector->disableInternalFilter(); $journals = $collector->getPaginatedJournals(); $journals->setPath('transactions/' . $what); @@ -122,14 +117,11 @@ class TransactionController extends Controller $subTitle = sprintf('%s (%s)', trans('firefly.title_' . $what), strtolower(trans('firefly.everything'))); $page = intval($request->get('page')) === 0 ? 1 : intval($request->get('page')); + /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); $collector->setTypes($types)->setLimit($pageSize)->setPage($page)->setAllAssetAccounts()->withBudgetInformation()->withCategoryInformation(); - - // do not filter transfers if $what = transfer. - if (!in_array($what, ['transfer', 'transfers'])) { - Log::debug('Also get opposing account info.'); - $collector->withOpposingAccount(); - } + $collector->withOpposingAccount(); + $collector->disableInternalFilter(); $journals = $collector->getPaginatedJournals(); $journals->setPath('transactions/' . $what . '/all'); @@ -165,13 +157,8 @@ class TransactionController extends Controller $collector->setUser(auth()->user()); $collector->setTypes($types)->setLimit($pageSize)->setPage($page)->setAllAssetAccounts(); $collector->setRange($start, $end)->withBudgetInformation()->withCategoryInformation(); - - // do not filter transfers if $what = transfer. - if (!in_array($what, ['transfer', 'transfers'])) { - Log::debug('Also get opposing account info.'); - $collector->withOpposingAccount(); - } - + $collector->withOpposingAccount(); + $collector->disableInternalFilter(); $journals = $collector->getPaginatedJournals(); $journals->setPath('transactions/' . $what . '/' . $date); diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php index cfd98fcafc..5d339960fa 100644 --- a/app/Support/Twig/General.php +++ b/app/Support/Twig/General.php @@ -17,6 +17,7 @@ use Carbon\Carbon; use FireflyIII\Models\Account; use FireflyIII\Models\TransactionJournal; use Route; +use Steam; use Twig_Extension; use Twig_SimpleFilter; use Twig_SimpleFunction; @@ -43,6 +44,7 @@ class General extends Twig_Extension $this->balance(), $this->formatFilesize(), $this->mimeIcon(), + ]; } @@ -59,6 +61,7 @@ class General extends Twig_Extension $this->env(), $this->getAmountFromJournal(), $this->activeRouteStrict(), + $this->steamPositive(), $this->activeRoutePartial(), $this->activeRoutePartialWhat(), ]; @@ -288,6 +291,18 @@ class General extends Twig_Extension ); } + /** + * @return Twig_SimpleFunction + */ + protected function steamPositive() + { + return new Twig_SimpleFunction( + 'steam_positive', function (string $str): string { + return Steam::positive($str); + } + ); + } + /** * @return Twig_SimpleFunction */ diff --git a/resources/views/list/journals-tasker.twig b/resources/views/list/journals-tasker.twig index 184ab9431f..7502719e27 100644 --- a/resources/views/list/journals-tasker.twig +++ b/resources/views/list/journals-tasker.twig @@ -33,7 +33,11 @@ -
                                                                                                                                                                                              {% if sorting %}{% endif %}
                                                                                                                                                                                              +
                                                                                                                                                                                              {% if sorting %}{% endif %}
                                                                                                                                                                                              @@ -58,10 +62,17 @@ - - {{ formatByCode(transaction.transaction_currency_code, transaction.transaction_amount) }} - - {{ optionalJournalAmount(transaction.journal_id, transaction.transaction_amount, transaction.transaction_currency_code, transaction.transaction_type_type) }} + {% if transaction.transaction_type_type == 'Transfer' %} + + {{ formatByCode(transaction.transaction_currency_code, steam_positive(transaction.transaction_amount)) }} + + {{ optionalJournalAmount(transaction.journal_id, transaction.transaction_amount, transaction.transaction_currency_code, transaction.transaction_type_type) }} + {% else %} + + {{ formatByCode(transaction.transaction_currency_code, transaction.transaction_amount) }} + + {{ optionalJournalAmount(transaction.journal_id, transaction.transaction_amount, transaction.transaction_currency_code, transaction.transaction_type_type) }} + {% endif %} From c8f6b42ce65ab058a7d36fa84c00c266fd3aac91 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Feb 2017 22:02:02 +0100 Subject: [PATCH 130/276] Fix tests --- app/Generator/Report/Audit/MonthReportGenerator.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/Generator/Report/Audit/MonthReportGenerator.php b/app/Generator/Report/Audit/MonthReportGenerator.php index d210f8b5d3..25f255f3a7 100644 --- a/app/Generator/Report/Audit/MonthReportGenerator.php +++ b/app/Generator/Report/Audit/MonthReportGenerator.php @@ -129,6 +129,16 @@ class MonthReportGenerator implements ReportGeneratorInterface return $this; } + /** + * @param Collection $tags + * + * @return ReportGeneratorInterface + */ + public function setTags(Collection $tags): ReportGeneratorInterface + { + return $this; + } + /** * @param Account $account * @param Carbon $date From 8bfcc3315a82aad09464211ab479dce5961f5b80 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 16 Feb 2017 21:01:22 +0100 Subject: [PATCH 131/276] This fixes #572 --- app/Http/Controllers/Auth/TwoFactorController.php | 10 +++++++--- app/Http/Controllers/JavascriptController.php | 4 +++- app/Http/Controllers/PreferencesController.php | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Auth/TwoFactorController.php b/app/Http/Controllers/Auth/TwoFactorController.php index d48f5906f2..bf3b425161 100644 --- a/app/Http/Controllers/Auth/TwoFactorController.php +++ b/app/Http/Controllers/Auth/TwoFactorController.php @@ -17,6 +17,7 @@ use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\TokenFormRequest; +use Illuminate\Http\Request; use Log; use Preferences; use Session; @@ -30,11 +31,14 @@ class TwoFactorController extends Controller { /** - * @return mixed + * @param Request $request + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View * @throws FireflyException */ - public function index() + public function index(Request $request) { + $user = auth()->user(); // to make sure the validator in the next step gets the secret, we push it in session @@ -50,7 +54,7 @@ class TwoFactorController extends Controller if (strlen(strval($secret)) === 0) { throw new FireflyException('Your two factor authentication secret is empty, which it cannot be at this point. Please check the log files.'); } - Session::flash('two-factor-secret', $secret); + $request->session()->flash('two-factor-secret', $secret); return view('auth.two-factor', compact('user', 'title')); } diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index 719371598e..6e63e57a43 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/app/Http/Controllers/JavascriptController.php @@ -13,6 +13,7 @@ namespace FireflyIII\Http\Controllers; use Amount; use FireflyIII\Exceptions\FireflyException; +use Illuminate\Http\Request; use Navigation; use Preferences; use Session; @@ -28,7 +29,7 @@ class JavascriptController extends Controller /** * */ - public function variables() + public function variables(Request $request) { $picker = $this->getDateRangePicker(); $start = Session::get('start'); @@ -52,6 +53,7 @@ class JavascriptController extends Controller 'localeconv' => $localeconv, 'language' => $lang, ]; + $request->session()->keep(['two-factor-secret']); return response() ->view('javascript.variables', $data, 200) diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index f4bd94c4b5..4373d61204 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -56,9 +56,9 @@ class PreferencesController extends Controller { $domain = $this->getDomain(); /** @noinspection PhpMethodParametersCountMismatchInspection */ - $secret = $google2fa->generateSecretKey(16, auth()->user()->id); + $secret = $google2fa->generateSecretKey(32, auth()->user()->id); Session::flash('two-factor-secret', $secret); - $image = $google2fa->getQRCodeInline('Firefly III at ' . $domain, null, $secret, 150); + $image = $google2fa->getQRCodeInline('Firefly III at ' . $domain, auth()->user()->email, $secret, 150); return view('preferences.code', compact('image')); From 4fbf0291e669daec53459d78b51fa0a5bf903933 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 16 Feb 2017 21:06:31 +0100 Subject: [PATCH 132/276] Updated composer things. --- composer.json | 10 ++-------- composer.lock | 48 +++++++++++++++++++++++------------------------- 2 files changed, 25 insertions(+), 33 deletions(-) diff --git a/composer.json b/composer.json index 8e493a3031..aa09eb9b44 100755 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "php": ">=7.0.0", "ext-intl": "*", "laravel/framework": "5.4.*", - "davejamesmiller/laravel-breadcrumbs": "3.1", + "davejamesmiller/laravel-breadcrumbs": "3.*", "watson/validating": "3.*", "doctrine/dbal": "^2.5", "league/commonmark": "0.15.*", @@ -105,11 +105,5 @@ }, "config": { "preferred-install": "dist" - }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/firefly-iii/laravel-breadcrumbs.git" - } - ] + } } diff --git a/composer.lock b/composer.lock index fea0f26c74..d7fca941ad 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "bccf2c2fdac584664dd6c952f1d91ba8", + "content-hash": "254ffef07304b93679b48182a179123f", "packages": [ { "name": "bacon/bacon-qr-code", @@ -104,16 +104,16 @@ }, { "name": "davejamesmiller/laravel-breadcrumbs", - "version": "3.1", + "version": "3.0.2", "source": { "type": "git", - "url": "https://github.com/firefly-iii/laravel-breadcrumbs.git", - "reference": "afebafc321432188b10dafc7b4c072501687f3d0" + "url": "https://github.com/davejamesmiller/laravel-breadcrumbs.git", + "reference": "6ca5a600003ecb52a5b5af14dad82033058604e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firefly-iii/laravel-breadcrumbs/zipball/afebafc321432188b10dafc7b4c072501687f3d0", - "reference": "afebafc321432188b10dafc7b4c072501687f3d0", + "url": "https://api.github.com/repos/davejamesmiller/laravel-breadcrumbs/zipball/6ca5a600003ecb52a5b5af14dad82033058604e1", + "reference": "6ca5a600003ecb52a5b5af14dad82033058604e1", "shasum": "" }, "require": { @@ -133,6 +133,7 @@ "DaveJamesMiller\\Breadcrumbs\\": "src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT License" ], @@ -148,10 +149,7 @@ "keywords": [ "laravel" ], - "support": { - "source": "https://github.com/firefly-iii/laravel-breadcrumbs/tree/3.1" - }, - "time": "2017-01-30T07:52:50+00:00" + "time": "2017-01-30T21:16:53+00:00" }, { "name": "doctrine/annotations", @@ -667,16 +665,16 @@ }, { "name": "laravel/framework", - "version": "v5.4.11", + "version": "v5.4.12", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "9cee8db07cfac13a3a49d17388c9ced4c52e17ac" + "reference": "707f32d32dce58232f7a860e0a1d62caf6f9dbfc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/9cee8db07cfac13a3a49d17388c9ced4c52e17ac", - "reference": "9cee8db07cfac13a3a49d17388c9ced4c52e17ac", + "url": "https://api.github.com/repos/laravel/framework/zipball/707f32d32dce58232f7a860e0a1d62caf6f9dbfc", + "reference": "707f32d32dce58232f7a860e0a1d62caf6f9dbfc", "shasum": "" }, "require": { @@ -792,7 +790,7 @@ "framework", "laravel" ], - "time": "2017-02-10T19:40:54+00:00" + "time": "2017-02-15T14:31:32+00:00" }, { "name": "laravelcollective/html", @@ -1585,16 +1583,16 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v5.4.5", + "version": "v5.4.6", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "cd142238a339459b10da3d8234220963f392540c" + "reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/cd142238a339459b10da3d8234220963f392540c", - "reference": "cd142238a339459b10da3d8234220963f392540c", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e", + "reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e", "shasum": "" }, "require": { @@ -1635,7 +1633,7 @@ "mail", "mailer" ], - "time": "2016-12-29T10:02:40+00:00" + "time": "2017-02-13T07:52:53+00:00" }, { "name": "symfony/console", @@ -2738,16 +2736,16 @@ }, { "name": "barryvdh/laravel-ide-helper", - "version": "v2.2.3", + "version": "v2.3.0", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "a7fc2ec489aada6062d3a63ddc915004a21e38af" + "reference": "555d3e37009bdb78f5d8bcea6eb8a816529a5cfa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/a7fc2ec489aada6062d3a63ddc915004a21e38af", - "reference": "a7fc2ec489aada6062d3a63ddc915004a21e38af", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/555d3e37009bdb78f5d8bcea6eb8a816529a5cfa", + "reference": "555d3e37009bdb78f5d8bcea6eb8a816529a5cfa", "shasum": "" }, "require": { @@ -2800,7 +2798,7 @@ "phpstorm", "sublime" ], - "time": "2017-01-05T21:20:42+00:00" + "time": "2017-02-13T19:20:12+00:00" }, { "name": "barryvdh/reflection-docblock", From fe54b2fa3a3b77e9ec5405e83778b6627c571c31 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 16 Feb 2017 22:13:04 +0100 Subject: [PATCH 133/276] Names are now links [skip ci] --- CHANGELOG.md | 115 ++++++++++++++++++++++++++------------------------- 1 file changed, 58 insertions(+), 57 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91120fe9b2..ab72b06288 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,17 +3,18 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [4.3.3] - 2017-02-02 + +## [4.3.4] - 2017-02-02 ### Fixed -- Fixed bug #550, reported by @worldworm! -- Fixed bug #551, reported by @t-me! +- Fixed bug #550, reported by [worldworm](https://github.com/worldworm)! +- Fixed bug #551, reported by [t-me](https://github.com/t-me)! ## [4.3.3] - 2017-01-30 _The 100th release of Firefly!_ ### Added -- Add locales to Docker (#534) by @elohmeier. +- Add locales to Docker (#534) by [elohmeier](https://github.com/elohmeier). - Optional database encryption. On by default. - Datepicker for Firefox and other browsers. - New instruction block for updating and installing. @@ -44,35 +45,35 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Fixed - The password reset routine was broken. -- Issue #522, thanks to @xpfgsyb -- Issue #524, thanks to @worldworm -- Issue #526, thanks to @worldworm -- Issue #528, thanks to @skibbipl +- Issue #522, thanks to [xpfgsyb](https://github.com/xpfgsyb) +- Issue #524, thanks to [worldworm](https://github.com/worldworm) +- Issue #526, thanks to [worldworm](https://github.com/worldworm) +- Issue #528, thanks to [skibbipl](https://github.com/skibbipl) - Various other fixes. ## [4.3.1] - 2017-01-04 ### Added - Support for Russian and Polish. - Support for a proper demo website. -- Support for custom decimal places in currencies (#506, suggested by @xpfgsyb). -- Most amounts are now right-aligned (#511, suggested by @xpfgsyb). +- Support for custom decimal places in currencies (#506, suggested by [xpfgsyb](https://github.com/xpfgsyb)). +- Most amounts are now right-aligned (#511, suggested by [xpfgsyb](https://github.com/xpfgsyb)). - German is now a "complete" language, more than 75% translated! ### Changed - **[New Github repository!](github.com/firefly-iii/firefly-iii)** - Better category overview. -- #502, thanks to @zjean +- #502, thanks to [zjean](https://github.com/zjean) ### Removed - Removed a lot of administration functions. - Removed ability to activate users. ### Fixed -- #501, thanks to @zjean -- #513, thanks to @skibbipl +- #501, thanks to [zjean](https://github.com/zjean) +- #513, thanks to [skibbipl](https://github.com/skibbipl) ### Security -- #519, thanks to @xpfgsyb +- #519, thanks to [xpfgsyb](https://github.com/xpfgsyb) ## [4.3.0] - 2015-12-26 ### Added @@ -105,7 +106,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Fixed - Various bugs -- Issue #472 thanks to @zjean +- Issue #472 thanks to [zjean](https://github.com/zjean) ## [4.2.1] - 2016-12-09 ### Added @@ -140,10 +141,10 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Fixed - Issue #408 - Various issues with split journals -- Issue #414, thx @zjean -- Issue #419, thx @schwalberich -- Issue #422, thx @xzaz -- Various import bugs, such as #416 (@zjean) +- Issue #414, thx [zjean](https://github.com/zjean) +- Issue #419, thx [schwalberich](https://github.com/schwalberich) +- Issue #422, thx [xzaz](https://github.com/xzaz) +- Various import bugs, such as #416 ([zjean](https://github.com/zjean)) ### Security @@ -165,9 +166,9 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Fixed - Made all pages more mobile friendly. -- Fixed #395 found by @marcoveeneman. -- Fixed #398 found by @marcoveeneman. -- Fixed #401 found by @marcoveeneman. +- Fixed #395 found by [marcoveeneman](https://github.com/marcoveeneman). +- Fixed #398 found by [marcoveeneman](https://github.com/marcoveeneman). +- Fixed #401 found by [marcoveeneman](https://github.com/marcoveeneman). - Many optimizations. - Updated many libraries. - Various bugs found by myself. @@ -179,13 +180,13 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Changed - Greatly expanded help pages and their function. -- Built a new transaction collector, which I think was the idea of @roberthorlings originally. +- Built a new transaction collector, which I think was the idea of [roberthorlings](https://github.com/roberthorlings) originally. - Rebuilt seach engine. ### Fixed -- #375, thanks to @schoentoon which made it impossible to resurrect currencies. -- #370 thanks to @ksmolder -- #378, thanks to @HomelessAvatar +- #375, thanks to [schoentoon](https://github.com/schoentoon) which made it impossible to resurrect currencies. +- #370 thanks to [ksmolder](https://github.com/ksmolder) +- #378, thanks to [HomelessAvatar](https://github.com/HomelessAvatar) ## [4.1.5] - 2016-11-01 ### Changed @@ -198,7 +199,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i ## [4.1.4] - 2016-10-30 ### Added -- New Dockerfile thanks to @schoentoon +- New Dockerfile thanks to [schoentoon](https://github.com/schoentoon) - Added changing the destination account as rule action. - Added changing the source account as rule action. - Can convert transactions into different types. @@ -211,10 +212,10 @@ An intermediate release because something in the Twig and Twigbridge libraries i - Change error message to refer to solution. ### Fixed -- #367 thanks to @HungryFeline -- #366 thanks to @3mz3t -- #362 and #341 thanks to @bnw -- #355 thanks to @roberthorlings +- #367 thanks to [HungryFeline](https://github.com/HungryFeline) +- #366 thanks to [3mz3t](https://github.com/3mz3t) +- #362 and #341 thanks to [bnw](https://github.com/bnw) +- #355 thanks to [roberthorlings](https://github.com/roberthorlings) ## [4.1.3] - 2016-10-22 ### Fixed @@ -246,29 +247,29 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Fixed - #357, where non utf-8 files would break Firefly. -- Tab delimiter is not properly loaded from import configuration (@roberthorlings) +- Tab delimiter is not properly loaded from import configuration ([roberthorlings](https://github.com/roberthorlings)) - System response to yearly bills ## [4.0.2] - 2016-10-14 ### Added -- Added ``intl`` dependency to composer file to ease installation (thanks @telyn) +- Added ``intl`` dependency to composer file to ease installation (thanks [telyn](https://github.com/telyn)) - Added support for Croatian. ### Changed - Updated all copyright notices to refer to the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/) - Fixed #344 -- Fixed #346, thanks to @SanderKleykens +- Fixed #346, thanks to [SanderKleykens](https://github.com/SanderKleykens) - #351 - Did some internal remodelling. ### Fixed -- PostgreSQL compatibility thanks to @SanderKleykens -- @RobertHorlings fixed a bug in the ABN Amro import specific. +- PostgreSQL compatibility thanks to [SanderKleykens](https://github.com/SanderKleykens) +- [roberthorlings](https://github.com/roberthorlings) fixed a bug in the ABN Amro import specific. ## [4.0.1] - 2016-10-04 ### Added -- New ING import specific by @tomwerf +- New ING import specific by [tomwerf](https://github.com/tomwerf) - New Presidents Choice specific to fix #307 - Added some trimming (#335) @@ -283,10 +284,10 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Fixed - Fixed a bug where incoming transactions would not be properly filtered in several reports. -- #334 by @cyberkov +- #334 by [cyberkov](https://github.com/cyberkov) - #337 - #336 -- #338 found by @roberthorlings +- #338 found by [roberthorlings](https://github.com/roberthorlings) ### Security - Initial release. @@ -297,29 +298,29 @@ An intermediate release because something in the Twig and Twigbridge libraries i ## [4.0.0] - 2015-09-26 ### Added - Upgraded to Laravel 5.3, most other libraries upgraded as well. -- Added GBP as currency, thanks to @Mortalife +- Added GBP as currency, thanks to [Mortalife](https://github.com/Mortalife) ### Changed - Jump to version 4.0.0. - Firefly III is now subject to a [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/) license. Previous versions of this software are still MIT licensed. ### Fixed -- Support for specific decimal places, thanks to @Mortalife +- Support for specific decimal places, thanks to [Mortalife](https://github.com/Mortalife) - Various CSS fixes -- Various bugs, thanks to @fuf, @sandermulders and @vissert +- Various bugs, thanks to [fuf](https://github.com/fuf), [sandermulders](https://github.com/sandermulders) and [vissert](https://github.com/vissert) - Various queries optimized for MySQL 5.7 ## [3.10.4] - 2015-09-14 ### Fixed -- Migration fix by @sandermulders -- Tricky import bug fix thanks to @vissert -- Currency preference will be correctly pulled from user settings, thanks to @fuf +- Migration fix by [sandermulders](https://github.com/sandermulders) +- Tricky import bug fix thanks to [vissert](https://github.com/vissert) +- Currency preference will be correctly pulled from user settings, thanks to [fuf](https://github.com/fuf) - Simplified code for upgrade instructions. ## [3.10.3] - 2016-08-29 ### Added -- More fields for mass-edit, thanks to @Vissert (#282) +- More fields for mass-edit, thanks to [vissert](https://github.com/vissert) (#282) - First start of German translation ### Changed @@ -330,7 +331,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Fixed - A bug in the translation routine broke the import. -- It was possible to destroy your Firefly installation by removing all currencies. Thanks @mondjef +- It was possible to destroy your Firefly installation by removing all currencies. Thanks [mondjef](https://github.com/mondjef) - Translation bugs. - Import bug. @@ -350,8 +351,8 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Fixed - Bug in the mass edit routines. -- Firefly III over a proxy will now work (see [issue #290](https://github.com/firefly-iii/firefly-iii/issues/290)), thanks @dfiel for reporting. -- Sneaky bug in the import routine, fixed by @Bonno +- Firefly III over a proxy will now work (see [issue #290](https://github.com/firefly-iii/firefly-iii/issues/290)), thanks [dfiel](https://github.com/dfiel) for reporting. +- Sneaky bug in the import routine, fixed by [Bonno](https://github.com/Bonno) ## [3.10.1] - 2016-08-25 ### Added @@ -389,15 +390,15 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Fixed - Issue #264 - Issue #265 -- Fixed amount calculation problems, #266, thanks @xzaz +- Fixed amount calculation problems, #266, thanks [xzaz](https://github.com/xzaz) - Issue #271 -- Issue #278, #273, thanks @StevenReitsma and @rubella +- Issue #278, #273, thanks [StevenReitsma](https://github.com/StevenReitsma) and [rubella](https://github.com/rubella) - Bug in attachment download routine would report the wrong size to the user's browser. - Various NULL errors fixed. - Various strict typing errors fixed. -- Fixed pagination problems, #276, thanks @xzaz +- Fixed pagination problems, #276, thanks [xzaz](https://github.com/xzaz) - Fixed a bug where an expense would be assigned to a piggy bank if you created a transfer first. -- Bulk update problems, #280, thanks @stickgrinder +- Bulk update problems, #280, thanks [stickgrinder](https://github.com/stickgrinder) - Fixed various problems with amount reporting of split transactions. ## [3.9.1] @@ -406,8 +407,8 @@ An intermediate release because something in the Twig and Twigbridge libraries i ## [3.9.0] ### Added -- @zjean has added code that allows you to force "https://"-URL's. -- @tonicospinelli has added Portuguese (Brazil) translations. +- [zjean](https://github.com/zjean) has added code that allows you to force "https://"-URL's. +- [tonicospinelli](https://github.com/tonicospinelli) has added Portuguese (Brazil) translations. - Firefly III supports the *splitting* of transactions: - A withdrawal (expense) can be split into multiple sub-transactions (with multiple destinations) - Likewise for deposits (incomes). You can set multiple sources. @@ -438,7 +439,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Fixed - Several CSV related bugs. - Several other bugs. -- Bugs fixed by @Bonno. +- Bugs fixed by [Bonno](https://github.com/Bonno). ## [3.8.3] - 2016-04-17 ### Added @@ -485,7 +486,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Added - Two factor authentication, thanks to the excellent work of [zjean](https://github.com/zjean). - A new chart showing your net worth in year and multi-year reports. -- You can now see if your current or future rules actually match any transactions, thanks to the excellent work of @roberthorlings. +- You can now see if your current or future rules actually match any transactions, thanks to the excellent work of [roberthorlings](https://github.com/roberthorlings). - New date fields for transactions. They are not used yet in reports or anything, but they can be filled in. - New routine to export your data. - Firefly III will mail the site owner when blocked users try to login, or when blocked domains are used in registrations. From 1857bb17d9f8af5a837ed53e1baae9ac6d8816e1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 16 Feb 2017 22:30:14 +0100 Subject: [PATCH 134/276] Approved. Step name: Proofread --- resources/lang/nl_NL/firefly.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index be0a94260f..fea18a6a8c 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -554,7 +554,7 @@ return [ 'select_more_than_one_account' => 'Selecteer meer dan één rekening', 'select_more_than_one_category' => 'Selecteer meer dan één categorie', 'select_more_than_one_budget' => 'Selecteer meer dan één budget', - 'select_more_than_one_tag' => 'Please select more than one tag', + 'select_more_than_one_tag' => 'Selecteer meer dan één tag', 'from_to' => 'Van :start tot en met :end', // categories: @@ -712,7 +712,7 @@ return [ 'report_type_audit' => 'Transactiehistorie-overzicht (audit)', 'report_type_category' => 'Categorierapport', 'report_type_budget' => 'Budgetrapport', - 'report_type_tag' => 'Tag report', + 'report_type_tag' => 'Tagrapport', 'report_type_meta-history' => 'Overzicht van categorieën, budgetten en contracten', 'more_info_help' => 'Meer informatie over deze rapporten vind je in de hulppagina\'s. Klik daarvoor op het (?) icoontje rechtsboven.', 'report_included_accounts' => 'Accounts in rapport', @@ -731,9 +731,9 @@ return [ 'report_has_no_extra_options' => 'Er zijn geen extra opties voor dit overzicht', 'reports_submit' => 'Bekijk overzicht', 'end_after_start_date' => 'Einddatum moet na begindatum liggen.', - 'select_category' => 'Select category(ies)', - 'select_budget' => 'Select budget(s).', - 'select_tag' => 'Select tag(s).', + 'select_category' => 'Selecteer categorie(ën)', + 'select_budget' => 'Selecteer budget(ten).', + 'select_tag' => 'Selecteer tag(s).', 'income_per_category' => 'Inkomen per categorie', 'expense_per_category' => 'Uitgaven per categorie', 'expense_per_budget' => 'Uitgaven per budget', @@ -964,5 +964,5 @@ return [ 'import_finished_text_with_link' => 'Je kan je geïmporteerde transacties op deze pagina terug vinden.', // sandstorm.io errors and messages: - 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', + 'sandstorm_not_available' => 'Deze functie werkt niet als je Firefly III gebruikt in combinatie met Sandstorm.IO.', ]; \ No newline at end of file From fa39330ceb819a3fabb08c0550595c29093d7414 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 16 Feb 2017 22:30:46 +0100 Subject: [PATCH 135/276] New change log [skip ci] --- CHANGELOG.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab72b06288..73c018a7db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,29 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [4.3.5] - 2017-02-19 +### Added +- Beta support for Sandstorm.IO +- Docker support by [@schoentoon](https://github.com/schoentoon), [@elohmeier](https://github.com/elohmeier), [@patrickkostjens](https://github.com/patrickkostjens) and [@crash7](https://github.com/crash7)! +### Changed +- Updated to laravel 5.4! +- User friendly error message +- Updated locales to support more operating systems, first reported in #536 by [dabenzel](https://github.com/dabenzel) +- Updated budget report +- Improved 404 page +- Smooth curves, improved by [elamperti](https://github.com/elamperti). + +### Fixed +- #549 +- #553 +- Fixed #559 reported by [elamperti](https://github.com/elamperti). +- #565, as reported by a user over the mail +- #566, as reported by [dspeckmann](https://github.com/dspeckmann) +- #567, as reported by [winsomniak](https://github.com/winsomniak) +- #569, as reported by [winsomniak](https://github.com/winsomniak) +- #572, as reported by [zjean](https://github.com/zjean) +- Many issues with the transaction filters which will fix reports (they tended to display the wrong amount). ## [4.3.4] - 2017-02-02 ### Fixed From 8460ee2dc4d3db72e9b88f2cf9aea4518a9a8284 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 16 Feb 2017 22:30:57 +0100 Subject: [PATCH 136/276] Small fix in read me [skip ci] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5005beca67..5013f18eab 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Firefly works on the principle that if you know where you're money is going, you - Firefly can import any CSV file, so migrating from other systems is easy. - Firefly runs on your own server, so you are fully in control of your data. Remember, there is no such thing as "the cloud", it’s just somebody else’s computer! -- Firefly has lots of features without becoming fancy or bloated. +- Firefly has lots of features without being fancy or bloated. - If you feel you're missing something you can just ask me and I'll add it! Firefly is pretty awesome. [You can read more about Firefly III, and its features, on the Github Pages](https://firefly-iii.github.io/). From 4ff5f526ba4e3afb36c0891282698a5d38abd572 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 16 Feb 2017 22:33:32 +0100 Subject: [PATCH 137/276] Add new lines to files. --- app/Http/Middleware/StartFireflySession.php | 2 +- app/Providers/FireflySessionProvider.php | 2 +- resources/views/errors/404.twig | 2 +- resources/views/reports/options/budget.twig | 2 +- tests/Feature/Controllers/AccountControllerTest.php | 2 +- tests/Feature/Controllers/Admin/ConfigurationControllerTest.php | 2 +- tests/Feature/Controllers/Admin/HomeControllerTest.php | 2 +- tests/Feature/Controllers/Admin/UserControllerTest.php | 2 +- tests/Feature/Controllers/AttachmentControllerTest.php | 2 +- tests/Feature/Controllers/Auth/TwoFactorControllerTest.php | 2 +- tests/Feature/Controllers/BillControllerTest.php | 2 +- tests/Feature/Controllers/BudgetControllerTest.php | 2 +- tests/Feature/Controllers/CategoryControllerTest.php | 2 +- tests/Feature/Controllers/Chart/AccountControllerTest.php | 2 +- tests/Feature/Controllers/Chart/BillControllerTest.php | 2 +- tests/Feature/Controllers/Chart/BudgetControllerTest.php | 2 +- tests/Feature/Controllers/Chart/CategoryControllerTest.php | 2 +- .../Feature/Controllers/Chart/CategoryReportControllerTest.php | 2 +- tests/Feature/Controllers/Chart/PiggyBankControllerTest.php | 2 +- tests/Feature/Controllers/Chart/ReportControllerTest.php | 2 +- tests/Feature/Controllers/CurrencyControllerTest.php | 2 +- tests/Feature/Controllers/ExportControllerTest.php | 2 +- tests/Feature/Controllers/HelpControllerTest.php | 2 +- tests/Feature/Controllers/HomeControllerTest.php | 2 +- tests/Feature/Controllers/ImportControllerTest.php | 2 +- tests/Feature/Controllers/JsonControllerTest.php | 2 +- tests/Feature/Controllers/NewUserControllerTest.php | 2 +- tests/Feature/Controllers/PiggyBankControllerTest.php | 2 +- tests/Feature/Controllers/Popup/ReportControllerTest.php | 2 +- tests/Feature/Controllers/PreferencesControllerTest.php | 2 +- tests/Feature/Controllers/ProfileControllerTest.php | 2 +- tests/Feature/Controllers/Report/AccountControllerTest.php | 2 +- tests/Feature/Controllers/Report/BalanceControllerTest.php | 2 +- tests/Feature/Controllers/Report/BudgetControllerTest.php | 2 +- tests/Feature/Controllers/Report/CategoryControllerTest.php | 2 +- tests/Feature/Controllers/Report/OperationsControllerTest.php | 2 +- tests/Feature/Controllers/ReportControllerTest.php | 2 +- tests/Feature/Controllers/RuleControllerTest.php | 2 +- tests/Feature/Controllers/RuleGroupControllerTest.php | 2 +- tests/Feature/Controllers/SearchControllerTest.php | 2 +- tests/Feature/Controllers/TagControllerTest.php | 2 +- tests/Feature/Controllers/Transaction/ConvertControllerTest.php | 2 +- tests/Feature/Controllers/Transaction/MassControllerTest.php | 2 +- tests/Feature/Controllers/Transaction/SingleControllerTest.php | 2 +- tests/Feature/Controllers/Transaction/SplitControllerTest.php | 2 +- tests/Feature/Controllers/TransactionControllerTest.php | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-) diff --git a/app/Http/Middleware/StartFireflySession.php b/app/Http/Middleware/StartFireflySession.php index 121491118d..ba6c518a08 100644 --- a/app/Http/Middleware/StartFireflySession.php +++ b/app/Http/Middleware/StartFireflySession.php @@ -52,4 +52,4 @@ class StartFireflySession extends StartSession } } -} \ No newline at end of file +} diff --git a/app/Providers/FireflySessionProvider.php b/app/Providers/FireflySessionProvider.php index 77eb25f0da..47dfb1bfe7 100644 --- a/app/Providers/FireflySessionProvider.php +++ b/app/Providers/FireflySessionProvider.php @@ -61,4 +61,4 @@ class FireflySessionProvider extends ServiceProvider } ); } -} \ No newline at end of file +} diff --git a/resources/views/errors/404.twig b/resources/views/errors/404.twig index d68a915eb6..d84ff35ca6 100644 --- a/resources/views/errors/404.twig +++ b/resources/views/errors/404.twig @@ -44,4 +44,4 @@ - \ No newline at end of file + diff --git a/resources/views/reports/options/budget.twig b/resources/views/reports/options/budget.twig index ee85764b89..103363f156 100644 --- a/resources/views/reports/options/budget.twig +++ b/resources/views/reports/options/budget.twig @@ -7,4 +7,4 @@ {% endfor %} - \ No newline at end of file + diff --git a/tests/Feature/Controllers/AccountControllerTest.php b/tests/Feature/Controllers/AccountControllerTest.php index aa4f23e378..b283f3e5d6 100644 --- a/tests/Feature/Controllers/AccountControllerTest.php +++ b/tests/Feature/Controllers/AccountControllerTest.php @@ -210,4 +210,4 @@ class AccountControllerTest extends TestCase $response->assertSee('
                                                                                                                                                                                                '); $response->assertSee($data['name']); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php b/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php index 6d5eccea35..9cc639b5ad 100644 --- a/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php +++ b/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php @@ -60,4 +60,4 @@ class ConfigurationControllerTest extends TestCase $response->assertStatus(302); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Admin/HomeControllerTest.php b/tests/Feature/Controllers/Admin/HomeControllerTest.php index bffa7af54f..10bd26ecd4 100644 --- a/tests/Feature/Controllers/Admin/HomeControllerTest.php +++ b/tests/Feature/Controllers/Admin/HomeControllerTest.php @@ -28,4 +28,4 @@ class HomeControllerTest extends TestCase $response->assertSee('
                                                                                                                                                                                                  '); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Admin/UserControllerTest.php b/tests/Feature/Controllers/Admin/UserControllerTest.php index 3ecb75fa53..1fb73886d1 100644 --- a/tests/Feature/Controllers/Admin/UserControllerTest.php +++ b/tests/Feature/Controllers/Admin/UserControllerTest.php @@ -53,4 +53,4 @@ class UserControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/AttachmentControllerTest.php b/tests/Feature/Controllers/AttachmentControllerTest.php index b405130351..9c47c9dadc 100644 --- a/tests/Feature/Controllers/AttachmentControllerTest.php +++ b/tests/Feature/Controllers/AttachmentControllerTest.php @@ -109,4 +109,4 @@ class AttachmentControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php b/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php index bfe699c963..8257233692 100644 --- a/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php +++ b/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php @@ -54,4 +54,4 @@ class TwoFactorControllerTest extends TestCase $response->assertStatus(200); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/BillControllerTest.php b/tests/Feature/Controllers/BillControllerTest.php index ea538a2a27..840fdfea50 100644 --- a/tests/Feature/Controllers/BillControllerTest.php +++ b/tests/Feature/Controllers/BillControllerTest.php @@ -166,4 +166,4 @@ class BillControllerTest extends TestCase $response->assertSee($data['name']); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/BudgetControllerTest.php b/tests/Feature/Controllers/BudgetControllerTest.php index 321fda6c6d..b10387cac6 100644 --- a/tests/Feature/Controllers/BudgetControllerTest.php +++ b/tests/Feature/Controllers/BudgetControllerTest.php @@ -269,4 +269,4 @@ class BudgetControllerTest extends TestCase $response->assertStatus(200); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/CategoryControllerTest.php b/tests/Feature/Controllers/CategoryControllerTest.php index 43b69b4bb6..c755e13d4a 100644 --- a/tests/Feature/Controllers/CategoryControllerTest.php +++ b/tests/Feature/Controllers/CategoryControllerTest.php @@ -244,4 +244,4 @@ class CategoryControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Chart/AccountControllerTest.php b/tests/Feature/Controllers/Chart/AccountControllerTest.php index d74b4989e3..9e4ebadd29 100644 --- a/tests/Feature/Controllers/Chart/AccountControllerTest.php +++ b/tests/Feature/Controllers/Chart/AccountControllerTest.php @@ -138,4 +138,4 @@ class AccountControllerTest extends TestCase $response->assertStatus(200); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Chart/BillControllerTest.php b/tests/Feature/Controllers/Chart/BillControllerTest.php index 653f907b39..3e590e8963 100644 --- a/tests/Feature/Controllers/Chart/BillControllerTest.php +++ b/tests/Feature/Controllers/Chart/BillControllerTest.php @@ -41,4 +41,4 @@ class BillControllerTest extends TestCase $response->assertStatus(200); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Chart/BudgetControllerTest.php b/tests/Feature/Controllers/Chart/BudgetControllerTest.php index 3cc1c86cf5..3f1c8461ae 100644 --- a/tests/Feature/Controllers/Chart/BudgetControllerTest.php +++ b/tests/Feature/Controllers/Chart/BudgetControllerTest.php @@ -88,4 +88,4 @@ class BudgetControllerTest extends TestCase $response->assertStatus(200); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Chart/CategoryControllerTest.php b/tests/Feature/Controllers/Chart/CategoryControllerTest.php index 423ac609f9..909acf3bbe 100644 --- a/tests/Feature/Controllers/Chart/CategoryControllerTest.php +++ b/tests/Feature/Controllers/Chart/CategoryControllerTest.php @@ -134,4 +134,4 @@ class CategoryControllerTest extends TestCase $response->assertStatus(200); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php b/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php index e89e0a9040..7a0b53b337 100644 --- a/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php @@ -67,4 +67,4 @@ class CategoryReportControllerTest extends TestCase $response->assertStatus(200); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php b/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php index 07156605fe..8d14ef24d3 100644 --- a/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php +++ b/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php @@ -27,4 +27,4 @@ class PiggyBankControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Chart/ReportControllerTest.php b/tests/Feature/Controllers/Chart/ReportControllerTest.php index 89c3149d2c..8b556a6c2e 100644 --- a/tests/Feature/Controllers/Chart/ReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/ReportControllerTest.php @@ -47,4 +47,4 @@ class ReportControllerTest extends TestCase $response->assertStatus(200); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/CurrencyControllerTest.php b/tests/Feature/Controllers/CurrencyControllerTest.php index bacd25268b..5d8426ae80 100644 --- a/tests/Feature/Controllers/CurrencyControllerTest.php +++ b/tests/Feature/Controllers/CurrencyControllerTest.php @@ -128,4 +128,4 @@ class CurrencyControllerTest extends TestCase $response->assertSessionHas('success'); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/ExportControllerTest.php b/tests/Feature/Controllers/ExportControllerTest.php index 6e72c1ccf9..2f9d131671 100644 --- a/tests/Feature/Controllers/ExportControllerTest.php +++ b/tests/Feature/Controllers/ExportControllerTest.php @@ -99,4 +99,4 @@ class ExportControllerTest extends TestCase $response->assertSee('ok'); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/HelpControllerTest.php b/tests/Feature/Controllers/HelpControllerTest.php index 63eb9017e4..94afda9ae2 100644 --- a/tests/Feature/Controllers/HelpControllerTest.php +++ b/tests/Feature/Controllers/HelpControllerTest.php @@ -33,4 +33,4 @@ class HelpControllerTest extends TestCase $response->assertStatus(200); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/HomeControllerTest.php b/tests/Feature/Controllers/HomeControllerTest.php index d5d76041d5..32f0be8912 100644 --- a/tests/Feature/Controllers/HomeControllerTest.php +++ b/tests/Feature/Controllers/HomeControllerTest.php @@ -83,4 +83,4 @@ class HomeControllerTest extends TestCase $response->assertSessionHas('error'); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/ImportControllerTest.php b/tests/Feature/Controllers/ImportControllerTest.php index 14c219bb8c..c45758fe4e 100644 --- a/tests/Feature/Controllers/ImportControllerTest.php +++ b/tests/Feature/Controllers/ImportControllerTest.php @@ -165,4 +165,4 @@ class ImportControllerTest extends TestCase $response->assertStatus(302); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/JsonControllerTest.php b/tests/Feature/Controllers/JsonControllerTest.php index 19064a4e98..38639ece72 100644 --- a/tests/Feature/Controllers/JsonControllerTest.php +++ b/tests/Feature/Controllers/JsonControllerTest.php @@ -146,4 +146,4 @@ class JsonControllerTest extends TestCase $response->assertStatus(200); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/NewUserControllerTest.php b/tests/Feature/Controllers/NewUserControllerTest.php index f8b82bbff1..510f813268 100644 --- a/tests/Feature/Controllers/NewUserControllerTest.php +++ b/tests/Feature/Controllers/NewUserControllerTest.php @@ -42,4 +42,4 @@ class NewUserControllerTest extends TestCase $response->assertSessionHas('success'); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/PiggyBankControllerTest.php b/tests/Feature/Controllers/PiggyBankControllerTest.php index d43e21e087..eeda5f5b4a 100644 --- a/tests/Feature/Controllers/PiggyBankControllerTest.php +++ b/tests/Feature/Controllers/PiggyBankControllerTest.php @@ -228,4 +228,4 @@ class PiggyBankControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Popup/ReportControllerTest.php b/tests/Feature/Controllers/Popup/ReportControllerTest.php index 97ba0c1bae..e805448550 100644 --- a/tests/Feature/Controllers/Popup/ReportControllerTest.php +++ b/tests/Feature/Controllers/Popup/ReportControllerTest.php @@ -140,4 +140,4 @@ class ReportControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/PreferencesControllerTest.php b/tests/Feature/Controllers/PreferencesControllerTest.php index e0a4d35c81..c3ddf6a33f 100644 --- a/tests/Feature/Controllers/PreferencesControllerTest.php +++ b/tests/Feature/Controllers/PreferencesControllerTest.php @@ -75,4 +75,4 @@ class PreferencesControllerTest extends TestCase $response->assertRedirect(route('preferences.index')); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/ProfileControllerTest.php b/tests/Feature/Controllers/ProfileControllerTest.php index 196d4124a6..e063012f3c 100644 --- a/tests/Feature/Controllers/ProfileControllerTest.php +++ b/tests/Feature/Controllers/ProfileControllerTest.php @@ -85,4 +85,4 @@ class ProfileControllerTest extends TestCase $response->assertRedirect(route('index')); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Report/AccountControllerTest.php b/tests/Feature/Controllers/Report/AccountControllerTest.php index b3742866a7..8c3262ef62 100644 --- a/tests/Feature/Controllers/Report/AccountControllerTest.php +++ b/tests/Feature/Controllers/Report/AccountControllerTest.php @@ -26,4 +26,4 @@ class AccountControllerTest extends TestCase $response->assertStatus(200); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Report/BalanceControllerTest.php b/tests/Feature/Controllers/Report/BalanceControllerTest.php index 9f86983084..3013f6c969 100644 --- a/tests/Feature/Controllers/Report/BalanceControllerTest.php +++ b/tests/Feature/Controllers/Report/BalanceControllerTest.php @@ -26,4 +26,4 @@ class BalanceControllerTest extends TestCase $response->assertStatus(200); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Report/BudgetControllerTest.php b/tests/Feature/Controllers/Report/BudgetControllerTest.php index cac69e42ae..a68b0fd460 100644 --- a/tests/Feature/Controllers/Report/BudgetControllerTest.php +++ b/tests/Feature/Controllers/Report/BudgetControllerTest.php @@ -36,4 +36,4 @@ class BudgetControllerTest extends TestCase $response->assertStatus(200); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Report/CategoryControllerTest.php b/tests/Feature/Controllers/Report/CategoryControllerTest.php index a2ee740193..e4b3e86a03 100644 --- a/tests/Feature/Controllers/Report/CategoryControllerTest.php +++ b/tests/Feature/Controllers/Report/CategoryControllerTest.php @@ -46,4 +46,4 @@ class CategoryControllerTest extends TestCase $response->assertStatus(200); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Report/OperationsControllerTest.php b/tests/Feature/Controllers/Report/OperationsControllerTest.php index 7f73582bd5..66380b23bf 100644 --- a/tests/Feature/Controllers/Report/OperationsControllerTest.php +++ b/tests/Feature/Controllers/Report/OperationsControllerTest.php @@ -46,4 +46,4 @@ class OperationsControllerTest extends TestCase $response->assertStatus(200); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/ReportControllerTest.php b/tests/Feature/Controllers/ReportControllerTest.php index 83cb8e1da3..640a754f50 100644 --- a/tests/Feature/Controllers/ReportControllerTest.php +++ b/tests/Feature/Controllers/ReportControllerTest.php @@ -91,4 +91,4 @@ class ReportControllerTest extends TestCase $response->assertStatus(302); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/RuleControllerTest.php b/tests/Feature/Controllers/RuleControllerTest.php index f25f2b0999..2cf8bf56e7 100644 --- a/tests/Feature/Controllers/RuleControllerTest.php +++ b/tests/Feature/Controllers/RuleControllerTest.php @@ -216,4 +216,4 @@ class RuleControllerTest extends TestCase $response->assertSessionHas('success'); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/RuleGroupControllerTest.php b/tests/Feature/Controllers/RuleGroupControllerTest.php index 740c5f332f..514389d3eb 100644 --- a/tests/Feature/Controllers/RuleGroupControllerTest.php +++ b/tests/Feature/Controllers/RuleGroupControllerTest.php @@ -161,4 +161,4 @@ class RuleGroupControllerTest extends TestCase $response->assertSessionHas('success'); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/SearchControllerTest.php b/tests/Feature/Controllers/SearchControllerTest.php index 1c53646475..babcefa82c 100644 --- a/tests/Feature/Controllers/SearchControllerTest.php +++ b/tests/Feature/Controllers/SearchControllerTest.php @@ -37,4 +37,4 @@ class SearchControllerTest extends TestCase $response->assertSee('
                                                                                                                                                                                                    '); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/TagControllerTest.php b/tests/Feature/Controllers/TagControllerTest.php index 317278a94b..99e159039f 100644 --- a/tests/Feature/Controllers/TagControllerTest.php +++ b/tests/Feature/Controllers/TagControllerTest.php @@ -123,4 +123,4 @@ class TagControllerTest extends TestCase $response->assertSessionHas('success'); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Transaction/ConvertControllerTest.php b/tests/Feature/Controllers/Transaction/ConvertControllerTest.php index 45f420d617..48384606d3 100644 --- a/tests/Feature/Controllers/Transaction/ConvertControllerTest.php +++ b/tests/Feature/Controllers/Transaction/ConvertControllerTest.php @@ -112,4 +112,4 @@ class ConvertControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Transaction/MassControllerTest.php b/tests/Feature/Controllers/Transaction/MassControllerTest.php index 77fc1b33f2..1af0ccbd3c 100644 --- a/tests/Feature/Controllers/Transaction/MassControllerTest.php +++ b/tests/Feature/Controllers/Transaction/MassControllerTest.php @@ -100,4 +100,4 @@ class MassControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Transaction/SingleControllerTest.php b/tests/Feature/Controllers/Transaction/SingleControllerTest.php index 423a1319d7..48b00fc2d4 100644 --- a/tests/Feature/Controllers/Transaction/SingleControllerTest.php +++ b/tests/Feature/Controllers/Transaction/SingleControllerTest.php @@ -132,4 +132,4 @@ class SingleControllerTest extends TestCase } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/Transaction/SplitControllerTest.php b/tests/Feature/Controllers/Transaction/SplitControllerTest.php index 006fad5ab8..93a7953f77 100644 --- a/tests/Feature/Controllers/Transaction/SplitControllerTest.php +++ b/tests/Feature/Controllers/Transaction/SplitControllerTest.php @@ -75,4 +75,4 @@ class SplitControllerTest extends TestCase $response->assertSee('
                                                                                                                                                                                                      '); } -} \ No newline at end of file +} diff --git a/tests/Feature/Controllers/TransactionControllerTest.php b/tests/Feature/Controllers/TransactionControllerTest.php index 595c99bfb3..b9ac046c69 100644 --- a/tests/Feature/Controllers/TransactionControllerTest.php +++ b/tests/Feature/Controllers/TransactionControllerTest.php @@ -77,4 +77,4 @@ class TransactionControllerTest extends TestCase $response->assertSee('
                                                                                                                                                                                                        '); } -} \ No newline at end of file +} From 466ec924923d15d0faa103b327628d61b85fdef4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 16 Feb 2017 22:34:37 +0100 Subject: [PATCH 138/276] Remove some commented code. --- app/Helpers/Collector/JournalCollector.php | 35 ---------------------- 1 file changed, 35 deletions(-) diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php index 945f604f6c..f709eff9ba 100644 --- a/app/Helpers/Collector/JournalCollector.php +++ b/app/Helpers/Collector/JournalCollector.php @@ -55,9 +55,7 @@ class JournalCollector implements JournalCollectorInterface 'transaction_journals.description', 'transaction_journals.date', 'transaction_journals.encrypted', - //'transaction_journals.transaction_currency_id', 'transaction_currencies.code as transaction_currency_code', - //'transaction_currencies.symbol as transaction_currency_symbol', 'transaction_types.type as transaction_type_type', 'transaction_journals.bill_id', 'bills.name as bill_name', @@ -505,39 +503,6 @@ class JournalCollector implements JournalCollectorInterface public function withOpposingAccount(): JournalCollectorInterface { $this->joinOpposingTables(); - - /** - $accountIds = $this->accountIds; - $this->query->where( - function (EloquentBuilder $q1) use ($accountIds) { - // set 1: - // where source is in the set of $accounts - // but destination is not. - $q1->where( - function (EloquentBuilder $q2) use ($accountIds) { - // transactions.account_id in set - $q2->whereIn('transactions.account_id', $accountIds); - // opposing.account_id not in set - $q2->whereNotIn('opposing.account_id', $accountIds); - - } - ); - // set 1: - // where source is not in the set of $accounts - // but destination is. - $q1->orWhere( - function (EloquentBuilder $q3) use ($accountIds) { - // transactions.account_id not in set - $q3->whereNotIn('transactions.account_id', $accountIds); - // B in set - // opposing.account_id not in set - $q3->whereIn('opposing.account_id', $accountIds); - } - ); - } - ); - * **/ - return $this; } From 5d0cdc4ffa12ece600ab78d70eacefc9f3903068 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 17 Feb 2017 06:42:36 +0100 Subject: [PATCH 139/276] Various code cleanup. --- app/Console/Commands/CreateImport.php | 2 +- .../Commands/UpgradeFireflyInstructions.php | 31 ++++--- app/Export/Collector/AttachmentCollector.php | 1 - app/Export/Collector/CollectorInterface.php | 14 +-- app/Helpers/Attachments/AttachmentHelper.php | 2 +- app/Helpers/Collector/JournalCollector.php | 1 + app/Helpers/Report/BalanceReportHelper.php | 4 +- app/Helpers/Report/ReportHelper.php | 3 - app/Helpers/Report/ReportHelperInterface.php | 1 - app/Http/Controllers/AccountController.php | 26 +++--- app/Http/Controllers/HomeController.php | 3 +- app/Http/Controllers/ReportController.php | 72 +++++++-------- app/Http/Middleware/Range.php | 1 - app/Http/Middleware/StartFireflySession.php | 1 - app/Http/Middleware/VerifyCsrfToken.php | 8 +- app/Http/Requests/Request.php | 2 +- app/Http/Requests/TagFormRequest.php | 1 - app/Import/ImportStorage.php | 4 +- app/Import/Setup/CsvSetup.php | 4 +- app/Models/Budget.php | 2 +- app/Providers/FireflyServiceProvider.php | 6 +- app/Providers/PiggyBankServiceProvider.php | 2 +- app/Providers/RuleServiceProvider.php | 1 + .../Currency/CurrencyRepository.php | 16 ++-- .../Journal/JournalRepository.php | 16 ++-- app/Repositories/Tag/TagRepository.php | 92 +++++++++---------- app/Rules/Actions/SetBudget.php | 6 +- app/Rules/Actions/SetDestinationAccount.php | 2 +- app/Rules/Actions/SetSourceAccount.php | 2 +- app/Rules/Triggers/AbstractTrigger.php | 1 - app/Support/Search/SearchInterface.php | 10 +- 31 files changed, 168 insertions(+), 169 deletions(-) diff --git a/app/Console/Commands/CreateImport.php b/app/Console/Commands/CreateImport.php index 00ff5094c6..d9b51a3b6d 100644 --- a/app/Console/Commands/CreateImport.php +++ b/app/Console/Commands/CreateImport.php @@ -81,7 +81,7 @@ class CreateImport extends Command /** @var ImportJobRepositoryInterface $jobRepository */ $jobRepository = app(ImportJobRepositoryInterface::class); $jobRepository->setUser($user); - $job = $jobRepository->create($type); + $job = $jobRepository->create($type); $this->line(sprintf('Created job "%s"...', $job->key)); Artisan::call('firefly:encrypt', ['file' => $file, 'key' => $job->key]); diff --git a/app/Console/Commands/UpgradeFireflyInstructions.php b/app/Console/Commands/UpgradeFireflyInstructions.php index a88c8ab79c..03e7761172 100644 --- a/app/Console/Commands/UpgradeFireflyInstructions.php +++ b/app/Console/Commands/UpgradeFireflyInstructions.php @@ -84,21 +84,8 @@ class UpgradeFireflyInstructions extends Command } } - /** - * Show a line - */ - private function showLine() + private function installInstructions() { - $line = '+'; - for ($i = 0; $i < 78; $i++) { - $line .= '-'; - } - $line .= '+'; - $this->line($line); - - } - - private function installInstructions() { /** @var string $version */ $version = config('firefly.version'); $config = config('upgrade.text.install'); @@ -120,6 +107,7 @@ class UpgradeFireflyInstructions extends Command $this->boxed('Firefly III should be ready for use.'); $this->boxed(''); $this->showLine(); + return; } @@ -129,6 +117,20 @@ class UpgradeFireflyInstructions extends Command $this->showLine(); } + /** + * Show a line + */ + private function showLine() + { + $line = '+'; + for ($i = 0; $i < 78; $i++) { + $line .= '-'; + } + $line .= '+'; + $this->line($line); + + } + private function updateInstructions() { /** @var string $version */ @@ -152,6 +154,7 @@ class UpgradeFireflyInstructions extends Command $this->boxed('Firefly III should be ready for use.'); $this->boxed(''); $this->showLine(); + return; } diff --git a/app/Export/Collector/AttachmentCollector.php b/app/Export/Collector/AttachmentCollector.php index 810dc1db85..f65cb72ae3 100644 --- a/app/Export/Collector/AttachmentCollector.php +++ b/app/Export/Collector/AttachmentCollector.php @@ -16,7 +16,6 @@ namespace FireflyIII\Export\Collector; use Carbon\Carbon; use Crypt; use FireflyIII\Models\Attachment; -use FireflyIII\Models\ExportJob; use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface; use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Support\Collection; diff --git a/app/Export/Collector/CollectorInterface.php b/app/Export/Collector/CollectorInterface.php index 54a3fa88a1..6cbbac9c2a 100644 --- a/app/Export/Collector/CollectorInterface.php +++ b/app/Export/Collector/CollectorInterface.php @@ -33,13 +33,6 @@ interface CollectorInterface */ public function run(): bool; - /** - * @param ExportJob $job - * - * @return mixed - */ - public function setJob(ExportJob $job); - /** * @param Collection $entries * @@ -48,4 +41,11 @@ interface CollectorInterface */ public function setEntries(Collection $entries); + /** + * @param ExportJob $job + * + * @return mixed + */ + public function setJob(ExportJob $job); + } diff --git a/app/Helpers/Attachments/AttachmentHelper.php b/app/Helpers/Attachments/AttachmentHelper.php index c7f7902109..74b189469b 100644 --- a/app/Helpers/Attachments/AttachmentHelper.php +++ b/app/Helpers/Attachments/AttachmentHelper.php @@ -45,7 +45,7 @@ class AttachmentHelper implements AttachmentHelperInterface public function __construct() { $this->maxUploadSize = intval(config('firefly.maxUploadSize')); - $this->allowedMimes = (array) config('firefly.allowedMimes'); + $this->allowedMimes = (array)config('firefly.allowedMimes'); $this->errors = new MessageBag; $this->messages = new MessageBag; $this->uploadDisk = Storage::disk('upload'); diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php index f709eff9ba..3a146310fd 100644 --- a/app/Helpers/Collector/JournalCollector.php +++ b/app/Helpers/Collector/JournalCollector.php @@ -503,6 +503,7 @@ class JournalCollector implements JournalCollectorInterface public function withOpposingAccount(): JournalCollectorInterface { $this->joinOpposingTables(); + return $this; } diff --git a/app/Helpers/Report/BalanceReportHelper.php b/app/Helpers/Report/BalanceReportHelper.php index ca0667cf66..2c6dae78a8 100644 --- a/app/Helpers/Report/BalanceReportHelper.php +++ b/app/Helpers/Report/BalanceReportHelper.php @@ -158,7 +158,9 @@ class BalanceReportHelper implements BalanceReportHelperInterface foreach ($accounts as $account) { $balanceEntry = new BalanceEntry; $balanceEntry->setAccount($account); - $spent = $this->budgetRepository->spentInPeriod(new Collection([$budgetLimit->budget]), new Collection([$account]), $budgetLimit->start_date, $budgetLimit->end_date); + $spent = $this->budgetRepository->spentInPeriod( + new Collection([$budgetLimit->budget]), new Collection([$account]), $budgetLimit->start_date, $budgetLimit->end_date + ); $balanceEntry->setSpent($spent); $line->addBalanceEntry($balanceEntry); } diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php index 2dfb605ee3..20a008e87a 100644 --- a/app/Helpers/Report/ReportHelper.php +++ b/app/Helpers/Report/ReportHelper.php @@ -16,15 +16,12 @@ namespace FireflyIII\Helpers\Report; use Carbon\Carbon; use FireflyIII\Helpers\Collection\Bill as BillCollection; use FireflyIII\Helpers\Collection\BillLine; -use FireflyIII\Helpers\Collection\Category as CategoryCollection; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Helpers\FiscalHelperInterface; use FireflyIII\Models\Bill; -use FireflyIII\Models\Category; use FireflyIII\Models\Transaction; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; -use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use Illuminate\Support\Collection; /** diff --git a/app/Helpers/Report/ReportHelperInterface.php b/app/Helpers/Report/ReportHelperInterface.php index 9124821593..fb14625126 100644 --- a/app/Helpers/Report/ReportHelperInterface.php +++ b/app/Helpers/Report/ReportHelperInterface.php @@ -15,7 +15,6 @@ namespace FireflyIII\Helpers\Report; use Carbon\Carbon; use FireflyIII\Helpers\Collection\Bill as BillCollection; -use FireflyIII\Helpers\Collection\Category as CategoryCollection; use FireflyIII\Helpers\Collection\Expense; use FireflyIII\Helpers\Collection\Income; use Illuminate\Support\Collection; diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 66b2ff26a0..47febc0f84 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -116,9 +116,9 @@ class AccountController extends Controller } /** - * @param Request $request - * @param AccountRepositoryInterface $repository - * @param Account $account + * @param Request $request + * @param AccountRepositoryInterface $repository + * @param Account $account * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ @@ -190,8 +190,8 @@ class AccountController extends Controller } /** - * @param AccountRepositoryInterface $repository - * @param string $what + * @param AccountRepositoryInterface $repository + * @param string $what * * @return View */ @@ -260,9 +260,9 @@ class AccountController extends Controller } /** - * @param Request $request - * @param AccountRepositoryInterface $repository - * @param Account $account + * @param Request $request + * @param AccountRepositoryInterface $repository + * @param Account $account * * @return View */ @@ -323,8 +323,8 @@ class AccountController extends Controller } /** - * @param AccountFormRequest $request - * @param AccountRepositoryInterface $repository + * @param AccountFormRequest $request + * @param AccountRepositoryInterface $repository * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @@ -356,9 +356,9 @@ class AccountController extends Controller } /** - * @param AccountFormRequest $request - * @param AccountRepositoryInterface $repository - * @param Account $account + * @param AccountFormRequest $request + * @param AccountRepositoryInterface $repository + * @param Account $account * * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 9dbce2de32..460a3e98cd 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -23,7 +23,6 @@ use Illuminate\Http\Request; use Illuminate\Support\Collection; use Log; use Preferences; -use Route; use Session; use View; @@ -91,7 +90,7 @@ class HomeController extends Controller public function flush(Request $request) { Preferences::mark(); - $request->session()->forget(['start', 'end','_previous', 'viewRange', 'range', 'is_custom_range']); + $request->session()->forget(['start', 'end', '_previous', 'viewRange', 'range', 'is_custom_range']); Artisan::call('cache:clear'); return redirect(route('index')); diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 5c32e086f9..a3ac8ab74a 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -98,42 +98,6 @@ class ReportController extends Controller } - /** - * @param Collection $accounts - * @param Collection $tags - * @param Carbon $start - * @param Carbon $end - * - * @return string - */ - public function tagReport(Collection $accounts, Collection $tags, Carbon $start, Carbon $end) - { - if ($end < $start) { - return view('error')->with('message', trans('firefly.end_after_start_date')); - } - if ($start < session('first')) { - $start = session('first'); - } - - View::share( - 'subTitle', trans( - 'firefly.report_tag', - [ - 'start' => $start->formatLocalized($this->monthFormat), - 'end' => $end->formatLocalized($this->monthFormat), - ] - ) - ); - - $generator = ReportGeneratorFactory::reportGenerator('Tag', $start, $end); - $generator->setAccounts($accounts); - $generator->setTags($tags); - $result = $generator->generate(); - - return $result; - - } - /** * @param Collection $accounts * @param Collection $budgets @@ -357,6 +321,42 @@ class ReportController extends Controller return redirect($uri); } + /** + * @param Collection $accounts + * @param Collection $tags + * @param Carbon $start + * @param Carbon $end + * + * @return string + */ + public function tagReport(Collection $accounts, Collection $tags, Carbon $start, Carbon $end) + { + if ($end < $start) { + return view('error')->with('message', trans('firefly.end_after_start_date')); + } + if ($start < session('first')) { + $start = session('first'); + } + + View::share( + 'subTitle', trans( + 'firefly.report_tag', + [ + 'start' => $start->formatLocalized($this->monthFormat), + 'end' => $end->formatLocalized($this->monthFormat), + ] + ) + ); + + $generator = ReportGeneratorFactory::reportGenerator('Tag', $start, $end); + $generator->setAccounts($accounts); + $generator->setTags($tags); + $result = $generator->generate(); + + return $result; + + } + /** * @return string */ diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php index fdf5322a4d..7bc60818c9 100644 --- a/app/Http/Middleware/Range.php +++ b/app/Http/Middleware/Range.php @@ -17,7 +17,6 @@ use Amount; use App; use Carbon\Carbon; use Closure; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Contracts\Auth\Guard; use Illuminate\Http\Request; diff --git a/app/Http/Middleware/StartFireflySession.php b/app/Http/Middleware/StartFireflySession.php index ba6c518a08..f72e13aed3 100644 --- a/app/Http/Middleware/StartFireflySession.php +++ b/app/Http/Middleware/StartFireflySession.php @@ -14,7 +14,6 @@ namespace FireflyIII\Http\Middleware; use Illuminate\Http\Request; use Illuminate\Session\Middleware\StartSession; use Illuminate\Session\SessionManager; -use Log; /** * Class StartFireflySession diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index 11ec0455c9..0c7c3ed591 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -12,9 +12,10 @@ declare(strict_types = 1); namespace FireflyIII\Http\Middleware; +use Carbon\Carbon; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier; use Symfony\Component\HttpFoundation\Cookie; -use Carbon\Carbon; + /** * Class VerifyCsrfToken * @@ -35,8 +36,9 @@ class VerifyCsrfToken extends BaseVerifier /** * Add the CSRF token to the response cookies. * - * @param \Illuminate\Http\Request $request - * @param \Symfony\Component\HttpFoundation\Response $response + * @param \Illuminate\Http\Request $request + * @param \Symfony\Component\HttpFoundation\Response $response + * * @return \Symfony\Component\HttpFoundation\Response */ protected function addCookieToResponse($request, $response) diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php index e73b17ac60..cf8bbae71e 100644 --- a/app/Http/Requests/Request.php +++ b/app/Http/Requests/Request.php @@ -87,7 +87,7 @@ class Request extends FormRequest */ protected function string(string $field): string { - $string = $this->get($field) ?? ''; + $string = $this->get($field) ?? ''; $search = [ "\u{0001}", // start of heading "\u{0002}", // start of text diff --git a/app/Http/Requests/TagFormRequest.php b/app/Http/Requests/TagFormRequest.php index 544b53c0b0..ce85aaa94f 100644 --- a/app/Http/Requests/TagFormRequest.php +++ b/app/Http/Requests/TagFormRequest.php @@ -12,7 +12,6 @@ declare(strict_types = 1); namespace FireflyIII\Http\Requests; -use Carbon\Carbon; use FireflyIII\Repositories\Tag\TagRepositoryInterface; /** diff --git a/app/Import/ImportStorage.php b/app/Import/ImportStorage.php index ec68385e0d..89b5e76ded 100644 --- a/app/Import/ImportStorage.php +++ b/app/Import/ImportStorage.php @@ -162,7 +162,7 @@ class ImportStorage /** @var TagRepositoryInterface $repository */ $repository = app(TagRepositoryInterface::class); $repository->setUser($this->user); - $data = [ + $data = [ 'tag' => trans('firefly.import_with_key', ['key' => $this->job->key]), 'date' => new Carbon, 'description' => null, @@ -171,7 +171,7 @@ class ImportStorage 'zoomLevel' => null, 'tagMode' => 'nothing', ]; - $tag = $repository->store($data); + $tag = $repository->store($data); return $tag; } diff --git a/app/Import/Setup/CsvSetup.php b/app/Import/Setup/CsvSetup.php index 3d0fc10ed3..01fcdc756a 100644 --- a/app/Import/Setup/CsvSetup.php +++ b/app/Import/Setup/CsvSetup.php @@ -182,8 +182,8 @@ class CsvSetup implements SetupInterface { /** @var AccountRepositoryInterface $repository */ $repository = app(AccountRepositoryInterface::class); - $importId = $data['csv_import_account'] ?? 0; - $account = $repository->find(intval($importId)); + $importId = $data['csv_import_account'] ?? 0; + $account = $repository->find(intval($importId)); $hasHeaders = isset($data['has_headers']) && intval($data['has_headers']) === 1 ? true : false; $config = $this->job->configuration; diff --git a/app/Models/Budget.php b/app/Models/Budget.php index 504802e05a..84ef039aa0 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -44,7 +44,7 @@ class Budget extends Model 'encrypted' => 'boolean', ]; /** @var array */ - protected $dates = ['created_at', 'updated_at', 'deleted_at']; + protected $dates = ['created_at', 'updated_at', 'deleted_at']; protected $fillable = ['user_id', 'name', 'active']; protected $hidden = ['encrypted']; protected $rules = ['name' => 'required|between:1,200',]; diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index 2ef97e48d2..40f456b4d0 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -122,14 +122,14 @@ class FireflyServiceProvider extends ServiceProvider $this->app->bind(MetaPieChartInterface::class, MetaPieChart::class); // other generators - $this->app->bind(ProcessorInterface::class,Processor::class); - $this->app->bind(ImportProcedureInterface::class,ImportProcedure::class); + $this->app->bind(ProcessorInterface::class, Processor::class); + $this->app->bind(ImportProcedureInterface::class, ImportProcedure::class); $this->app->bind(UserRepositoryInterface::class, UserRepository::class); $this->app->bind(AttachmentHelperInterface::class, AttachmentHelper::class); $this->app->bind(HelpInterface::class, Help::class); $this->app->bind(ReportHelperInterface::class, ReportHelper::class); - $this->app->bind(FiscalHelperInterface::class,FiscalHelper::class); + $this->app->bind(FiscalHelperInterface::class, FiscalHelper::class); $this->app->bind(BalanceReportHelperInterface::class, BalanceReportHelper::class); $this->app->bind(BudgetReportHelperInterface::class, BudgetReportHelper::class); } diff --git a/app/Providers/PiggyBankServiceProvider.php b/app/Providers/PiggyBankServiceProvider.php index fb1aaf7d5f..d91f362114 100644 --- a/app/Providers/PiggyBankServiceProvider.php +++ b/app/Providers/PiggyBankServiceProvider.php @@ -14,7 +14,6 @@ declare(strict_types = 1); namespace FireflyIII\Providers; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\Repositories\PiggyBank\PiggyBankRepository; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use Illuminate\Foundation\Application; @@ -53,6 +52,7 @@ class PiggyBankServiceProvider extends ServiceProvider if ($app->auth->check()) { $repository->setUser(auth()->user()); } + return $repository; } ); diff --git a/app/Providers/RuleServiceProvider.php b/app/Providers/RuleServiceProvider.php index 5d694411b3..9d047d9e74 100644 --- a/app/Providers/RuleServiceProvider.php +++ b/app/Providers/RuleServiceProvider.php @@ -51,6 +51,7 @@ class RuleServiceProvider extends ServiceProvider if ($app->auth->check()) { $repository->setUser(auth()->user()); } + return $repository; } ); diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index bb1444d73c..b053780cac 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -30,14 +30,6 @@ class CurrencyRepository implements CurrencyRepositoryInterface /** @var User */ private $user; - /** - * @param User $user - */ - public function setUser(User $user) - { - $this->user = $user; - } - /** * @param TransactionCurrency $currency * @@ -186,6 +178,14 @@ class CurrencyRepository implements CurrencyRepositoryInterface return $preferred; } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * @param array $data * diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index 12ce898ff1..31ac868afa 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -43,14 +43,6 @@ class JournalRepository implements JournalRepositoryInterface /** @var array */ private $validMetaFields = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date', 'internal_reference', 'notes']; - /** - * @param User $user - */ - public function setUser(User $user) - { - $this->user = $user; - } - /** * @param TransactionJournal $journal * @param TransactionType $type @@ -143,6 +135,14 @@ class JournalRepository implements JournalRepositoryInterface return TransactionType::orderBy('type', 'ASC')->get(); } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * @param array $data * diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 9f91816252..57bade58b5 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -34,14 +34,6 @@ class TagRepository implements TagRepositoryInterface /** @var User */ private $user; - /** - * @param User $user - */ - public function setUser(User $user) - { - $this->user = $user; - } - /** * * @param TransactionJournal $journal @@ -88,6 +80,25 @@ class TagRepository implements TagRepositoryInterface return true; } + /** + * @param Tag $tag + * @param Carbon $start + * @param Carbon $end + * + * @return string + */ + public function earnedInPeriod(Tag $tag, Carbon $start, Carbon $end): string + { + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setUser($this->user); + $collector->setRange($start, $end)->setTypes([TransactionType::DEPOSIT])->setAllAssetAccounts()->setTag($tag); + $set = $collector->getJournals(); + $sum = strval($set->sum('transaction_amount')); + + return $sum; + } + /** * @param int $tagId * @@ -167,6 +178,33 @@ class TagRepository implements TagRepositoryInterface return new Carbon; } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + + /** + * @param Tag $tag + * @param Carbon $start + * @param Carbon $end + * + * @return string + */ + public function spentInPeriod(Tag $tag, Carbon $start, Carbon $end): string + { + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setUser($this->user); + $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setAllAssetAccounts()->setTag($tag); + $set = $collector->getJournals(); + $sum = strval($set->sum('transaction_amount')); + + return $sum; + } + /** * @param array $data * @@ -383,42 +421,4 @@ class TagRepository implements TagRepositoryInterface return false; } - - /** - * @param Tag $tag - * @param Carbon $start - * @param Carbon $end - * - * @return string - */ - public function earnedInPeriod(Tag $tag, Carbon $start, Carbon $end): string - { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setUser($this->user); - $collector->setRange($start, $end)->setTypes([TransactionType::DEPOSIT])->setAllAssetAccounts()->setTag($tag); - $set = $collector->getJournals(); - $sum = strval($set->sum('transaction_amount')); - - return $sum; - } - - /** - * @param Tag $tag - * @param Carbon $start - * @param Carbon $end - * - * @return string - */ - public function spentInPeriod(Tag $tag, Carbon $start, Carbon $end): string - { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); - $collector->setUser($this->user); - $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setAllAssetAccounts()->setTag($tag); - $set = $collector->getJournals(); - $sum = strval($set->sum('transaction_amount')); - - return $sum; - } } diff --git a/app/Rules/Actions/SetBudget.php b/app/Rules/Actions/SetBudget.php index e9f8c1fae9..7797501e2b 100644 --- a/app/Rules/Actions/SetBudget.php +++ b/app/Rules/Actions/SetBudget.php @@ -52,9 +52,9 @@ class SetBudget implements ActionInterface /** @var BudgetRepositoryInterface $repository */ $repository = app(BudgetRepositoryInterface::class); $repository->setUser($journal->user); - $search = $this->action->action_value; - $budgets = $repository->getActiveBudgets(); - $budget = $budgets->filter( + $search = $this->action->action_value; + $budgets = $repository->getActiveBudgets(); + $budget = $budgets->filter( function (Budget $current) use ($search) { return $current->name == $search; } diff --git a/app/Rules/Actions/SetDestinationAccount.php b/app/Rules/Actions/SetDestinationAccount.php index 25677e546b..33ca3d27c3 100644 --- a/app/Rules/Actions/SetDestinationAccount.php +++ b/app/Rules/Actions/SetDestinationAccount.php @@ -62,7 +62,7 @@ class SetDestinationAccount implements ActionInterface $this->journal = $journal; $this->repository = app(AccountRepositoryInterface::class); $this->repository->setUser($journal->user); - $count = $journal->transactions()->count(); + $count = $journal->transactions()->count(); if ($count > 2) { Log::error(sprintf('Cannot change destination account of journal #%d because it is a split journal.', $journal->id)); diff --git a/app/Rules/Actions/SetSourceAccount.php b/app/Rules/Actions/SetSourceAccount.php index fc8067856c..07f0125d4a 100644 --- a/app/Rules/Actions/SetSourceAccount.php +++ b/app/Rules/Actions/SetSourceAccount.php @@ -62,7 +62,7 @@ class SetSourceAccount implements ActionInterface $this->journal = $journal; $this->repository = app(AccountRepositoryInterface::class); $this->repository->setUser($journal->user); - $count = $journal->transactions()->count(); + $count = $journal->transactions()->count(); if ($count > 2) { Log::error(sprintf('Cannot change source account of journal #%d because it is a split journal.', $journal->id)); diff --git a/app/Rules/Triggers/AbstractTrigger.php b/app/Rules/Triggers/AbstractTrigger.php index 0fd9a3bfd8..d38e1dcd9f 100644 --- a/app/Rules/Triggers/AbstractTrigger.php +++ b/app/Rules/Triggers/AbstractTrigger.php @@ -75,7 +75,6 @@ class AbstractTrigger } - /** * @param RuleTrigger $trigger * @param TransactionJournal $journal diff --git a/app/Support/Search/SearchInterface.php b/app/Support/Search/SearchInterface.php index ed9c3c6c88..918f3caee3 100644 --- a/app/Support/Search/SearchInterface.php +++ b/app/Support/Search/SearchInterface.php @@ -30,11 +30,6 @@ interface SearchInterface */ public function searchAccounts(array $words): Collection; - /** - * @param User $user - */ - public function setUser(User $user); - /** * @param array $words * @@ -63,4 +58,9 @@ interface SearchInterface * @return Collection */ public function searchTransactions(array $words): Collection; + + /** + * @param User $user + */ + public function setUser(User $user); } From 65a899bf253ce04b4af6ffef43237f1ae20071ba Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 17 Feb 2017 20:14:22 +0100 Subject: [PATCH 140/276] Clean up session code --- app/Handlers/Events/UserEventHandler.php | 4 +- app/Http/Controllers/AccountController.php | 44 ++++++++------- app/Http/Controllers/AttachmentController.php | 25 +++++---- .../Controllers/Auth/TwoFactorController.php | 4 +- app/Http/Controllers/BillController.php | 55 ++++++++++--------- app/Http/Controllers/BudgetController.php | 45 ++++++++------- app/Http/Controllers/CategoryController.php | 40 ++++++++------ app/Http/Controllers/CurrencyController.php | 53 +++++++++--------- .../Transaction/SingleController.php | 2 +- .../RedirectIfTwoFactorAuthenticated.php | 2 +- .../RuleGroup/RuleGroupRepository.php | 16 +++--- 11 files changed, 155 insertions(+), 135 deletions(-) diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php index 5144843bf7..5f86d60a57 100644 --- a/app/Handlers/Events/UserEventHandler.php +++ b/app/Handlers/Events/UserEventHandler.php @@ -62,8 +62,8 @@ class UserEventHandler public function logoutUser(): bool { // dump stuff from the session: - Session::forget('twofactor-authenticated'); - Session::forget('twofactor-authenticated-date'); + Session::forget('twoFactorAuthenticated'); + Session::forget('twoFactorAuthenticatedDate'); return true; } diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 47febc0f84..2c12693bcd 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -31,7 +31,6 @@ use Illuminate\Support\Collection; use Log; use Navigation; use Preferences; -use Session; use Steam; use View; @@ -61,11 +60,12 @@ class AccountController extends Controller } /** - * @param string $what + * @param Request $request + * @param string $what * - * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory|View + * @return View */ - public function create(string $what = 'asset') + public function create(Request $request, string $what = 'asset') { /** @var CurrencyRepositoryInterface $repository */ $repository = app(CurrencyRepositoryInterface::class); @@ -80,27 +80,28 @@ class AccountController extends Controller // pre fill some data - Session::flash('preFilled', ['currency_id' => $defaultCurrency->id,]); + $request->session()->flash('preFilled', ['currency_id' => $defaultCurrency->id,]); // put previous url in session if not redirect from store (not "create another"). if (session('accounts.create.fromStore') !== true) { $this->rememberPreviousUri('accounts.create.uri'); } - Session::forget('accounts.create.fromStore'); - Session::flash('gaEventCategory', 'accounts'); - Session::flash('gaEventAction', 'create-' . $what); + $request->session()->forget('accounts.create.fromStore'); + $request->session()->flash('gaEventCategory', 'accounts'); + $request->session()->flash('gaEventAction', 'create-' . $what); return view('accounts.create', compact('subTitleIcon', 'what', 'subTitle', 'currencies', 'roles')); } /** + * @param Request $request * @param AccountRepositoryInterface $repository * @param Account $account * * @return View */ - public function delete(AccountRepositoryInterface $repository, Account $account) + public function delete(Request $request, AccountRepositoryInterface $repository, Account $account) { $typeName = config('firefly.shortNamesByFullName.' . $account->accountType->type); $subTitle = trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]); @@ -109,8 +110,8 @@ class AccountController extends Controller // put previous url in session $this->rememberPreviousUri('accounts.delete.uri'); - Session::flash('gaEventCategory', 'accounts'); - Session::flash('gaEventAction', 'delete-' . $typeName); + $request->session()->flash('gaEventCategory', 'accounts'); + $request->session()->flash('gaEventAction', 'delete-' . $typeName); return view('accounts.delete', compact('account', 'subTitle', 'accountList')); } @@ -131,18 +132,19 @@ class AccountController extends Controller $repository->destroy($account, $moveTo); - Session::flash('success', strval(trans('firefly.' . $typeName . '_deleted', ['name' => $name]))); + $request->session()->flash('success', strval(trans('firefly.' . $typeName . '_deleted', ['name' => $name]))); Preferences::mark(); return redirect($this->getPreviousUri('accounts.delete.uri')); } /** + * @param Request $request * @param Account $account * * @return View */ - public function edit(Account $account) + public function edit(Request $request, Account $account) { $what = config('firefly.shortNamesByFullName')[$account->accountType->type]; @@ -161,7 +163,7 @@ class AccountController extends Controller if (session('accounts.edit.fromUpdate') !== true) { $this->rememberPreviousUri('accounts.edit.uri'); } - Session::forget('accounts.edit.fromUpdate'); + $request->session()->forget('accounts.edit.fromUpdate'); // pre fill some useful values. @@ -182,9 +184,9 @@ class AccountController extends Controller 'virtualBalance' => $account->virtual_balance, 'currency_id' => $account->getMeta('currency_id'), ]; - Session::flash('preFilled', $preFilled); - Session::flash('gaEventCategory', 'accounts'); - Session::flash('gaEventAction', 'edit-' . $what); + $request->session()->flash('preFilled', $preFilled); + $request->session()->flash('gaEventCategory', 'accounts'); + $request->session()->flash('gaEventAction', 'edit-' . $what); return view('accounts.edit', compact('currencies', 'account', 'subTitle', 'subTitleIcon', 'openingBalance', 'what', 'roles')); } @@ -334,7 +336,7 @@ class AccountController extends Controller $data = $request->getAccountData(); $account = $repository->store($data); - Session::flash('success', strval(trans('firefly.stored_new_account', ['name' => $account->name]))); + $request->session()->flash('success', strval(trans('firefly.stored_new_account', ['name' => $account->name]))); Preferences::mark(); // update preferences if necessary: @@ -346,7 +348,7 @@ class AccountController extends Controller if (intval($request->get('create_another')) === 1) { // set value so create routine will not overwrite URL: - Session::put('accounts.create.fromStore', true); + $request->session()->put('accounts.create.fromStore', true); return redirect(route('accounts.create', [$request->input('what')]))->withInput(); } @@ -367,12 +369,12 @@ class AccountController extends Controller $data = $request->getAccountData(); $repository->update($account, $data); - Session::flash('success', strval(trans('firefly.updated_account', ['name' => $account->name]))); + $request->session()->flash('success', strval(trans('firefly.updated_account', ['name' => $account->name]))); Preferences::mark(); if (intval($request->get('return_to_edit')) === 1) { // set value so edit routine will not overwrite URL: - Session::put('accounts.edit.fromUpdate', true); + $request->session()->put('accounts.edit.fromUpdate', true); return redirect(route('accounts.edit', [$account->id]))->withInput(['return_to_edit' => 1]); } diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php index a6532309f1..51b24e4d93 100644 --- a/app/Http/Controllers/AttachmentController.php +++ b/app/Http/Controllers/AttachmentController.php @@ -18,10 +18,10 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Requests\AttachmentFormRequest; use FireflyIII\Models\Attachment; use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface; +use Illuminate\Http\Request; use Illuminate\Http\Response as LaravelResponse; use Preferences; use Response; -use Session; use View; /** @@ -53,35 +53,37 @@ class AttachmentController extends Controller } /** + * @param Request $request * @param Attachment $attachment * * @return View */ - public function delete(Attachment $attachment) + public function delete(Request $request, Attachment $attachment) { $subTitle = trans('firefly.delete_attachment', ['name' => $attachment->filename]); // put previous url in session $this->rememberPreviousUri('attachments.delete.uri'); - Session::flash('gaEventCategory', 'attachments'); - Session::flash('gaEventAction', 'delete-attachment'); + $request->session()->flash('gaEventCategory', 'attachments'); + $request->session()->flash('gaEventAction', 'delete-attachment'); return view('attachments.delete', compact('attachment', 'subTitle')); } /** + * @param Request $request * @param AttachmentRepositoryInterface $repository * @param Attachment $attachment * - * @return \Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function destroy(AttachmentRepositoryInterface $repository, Attachment $attachment) + public function destroy(Request $request, AttachmentRepositoryInterface $repository, Attachment $attachment) { $name = $attachment->filename; $repository->destroy($attachment); - Session::flash('success', strval(trans('firefly.attachment_deleted', ['name' => $name]))); + $request->session()->flash('success', strval(trans('firefly.attachment_deleted', ['name' => $name]))); Preferences::mark(); return redirect($this->getPreviousUri('attachments.delete.uri')); @@ -119,11 +121,12 @@ class AttachmentController extends Controller } /** + * @param Request $request * @param Attachment $attachment * * @return View */ - public function edit(Attachment $attachment) + public function edit(Request $request, Attachment $attachment) { $subTitleIcon = 'fa-pencil'; $subTitle = trans('firefly.edit_attachment', ['name' => $attachment->filename]); @@ -132,7 +135,7 @@ class AttachmentController extends Controller if (session('attachments.edit.fromUpdate') !== true) { $this->rememberPreviousUri('attachments.edit.uri'); } - Session::forget('attachments.edit.fromUpdate'); + $request->session()->forget('attachments.edit.fromUpdate'); return view('attachments.edit', compact('attachment', 'subTitleIcon', 'subTitle')); } @@ -169,12 +172,12 @@ class AttachmentController extends Controller $data = $request->getAttachmentData(); $repository->update($attachment, $data); - Session::flash('success', strval(trans('firefly.attachment_updated', ['name' => $attachment->filename]))); + $request->session()->flash('success', strval(trans('firefly.attachment_updated', ['name' => $attachment->filename]))); Preferences::mark(); if (intval($request->get('return_to_edit')) === 1) { // set value so edit routine will not overwrite URL: - Session::put('attachments.edit.fromUpdate', true); + $request->session()->put('attachments.edit.fromUpdate', true); return redirect(route('attachments.edit', [$attachment->id]))->withInput(['return_to_edit' => 1]); } diff --git a/app/Http/Controllers/Auth/TwoFactorController.php b/app/Http/Controllers/Auth/TwoFactorController.php index bf3b425161..66df10f66e 100644 --- a/app/Http/Controllers/Auth/TwoFactorController.php +++ b/app/Http/Controllers/Auth/TwoFactorController.php @@ -86,8 +86,8 @@ class TwoFactorController extends Controller */ public function postIndex(TokenFormRequest $request) { - Session::put('twofactor-authenticated', true); - Session::put('twofactor-authenticated-date', new Carbon); + Session::put('twoFactorAuthenticated', true); + Session::put('twoFactorAuthenticatedDate', new Carbon); return redirect(route('home')); } diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index ae95ba23ef..b05ede6e52 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -22,7 +22,6 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface; use Illuminate\Http\Request; use Illuminate\Support\Collection; use Preferences; -use Session; use URL; use View; @@ -53,9 +52,11 @@ class BillController extends Controller } /** + * @param Request $request + * * @return View */ - public function create() + public function create(Request $request) { $periods = []; foreach (config('firefly.bill_periods') as $current) { @@ -68,52 +69,55 @@ class BillController extends Controller if (session('bills.create.fromStore') !== true) { $this->rememberPreviousUri('bills.create.uri'); } - Session::forget('bills.create.fromStore'); - Session::flash('gaEventCategory', 'bills'); - Session::flash('gaEventAction', 'create'); + $request->session()->forget('bills.create.fromStore'); + $request->session()->flash('gaEventCategory', 'bills'); + $request->session()->flash('gaEventAction', 'create'); return view('bills.create', compact('periods', 'subTitle')); } /** - * @param Bill $bill + * @param Request $request + * @param Bill $bill * * @return View */ - public function delete(Bill $bill) + public function delete(Request $request, Bill $bill) { // put previous url in session $this->rememberPreviousUri('bills.delete.uri'); - Session::flash('gaEventCategory', 'bills'); - Session::flash('gaEventAction', 'delete'); + $request->session()->flash('gaEventCategory', 'bills'); + $request->session()->flash('gaEventAction', 'delete'); $subTitle = trans('firefly.delete_bill', ['name' => $bill->name]); return view('bills.delete', compact('bill', 'subTitle')); } /** + * @param Request $request * @param BillRepositoryInterface $repository * @param Bill $bill * - * @return \Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function destroy(BillRepositoryInterface $repository, Bill $bill) + public function destroy(Request $request, BillRepositoryInterface $repository, Bill $bill) { $name = $bill->name; $repository->destroy($bill); - Session::flash('success', strval(trans('firefly.deleted_bill', ['name' => $name]))); + $request->session()->flash('success', strval(trans('firefly.deleted_bill', ['name' => $name]))); Preferences::mark(); return redirect($this->getPreviousUri('bills.delete.uri')); } /** - * @param Bill $bill + * @param Request $request + * @param Bill $bill * * @return View */ - public function edit(Bill $bill) + public function edit(Request $request, Bill $bill) { $periods = []; foreach (config('firefly.bill_periods') as $current) { @@ -125,9 +129,9 @@ class BillController extends Controller if (session('bills.edit.fromUpdate') !== true) { $this->rememberPreviousUri('bills.edit.uri'); } - Session::forget('bills.edit.fromUpdate'); - Session::flash('gaEventCategory', 'bills'); - Session::flash('gaEventAction', 'edit'); + $request->session()->forget('bills.edit.fromUpdate'); + $request->session()->flash('gaEventCategory', 'bills'); + $request->session()->flash('gaEventAction', 'edit'); return view('bills.edit', compact('subTitle', 'periods', 'bill')); } @@ -163,15 +167,16 @@ class BillController extends Controller } /** + * @param Request $request * @param BillRepositoryInterface $repository * @param Bill $bill * - * @return \Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function rescan(BillRepositoryInterface $repository, Bill $bill) + public function rescan(Request $request, BillRepositoryInterface $repository, Bill $bill) { if (intval($bill->active) == 0) { - Session::flash('warning', strval(trans('firefly.cannot_scan_inactive_bill'))); + $request->session()->flash('warning', strval(trans('firefly.cannot_scan_inactive_bill'))); return redirect(URL::previous()); } @@ -183,7 +188,7 @@ class BillController extends Controller } - Session::flash('success', strval(trans('firefly.rescanned_bill'))); + $request->session()->flash('success', strval(trans('firefly.rescanned_bill'))); Preferences::mark(); return redirect(URL::previous()); @@ -231,12 +236,12 @@ class BillController extends Controller { $billData = $request->getBillData(); $bill = $repository->store($billData); - Session::flash('success', strval(trans('firefly.stored_new_bill', ['name' => e($bill->name)]))); + $request->session()->flash('success', strval(trans('firefly.stored_new_bill', ['name' => e($bill->name)]))); Preferences::mark(); if (intval($request->get('create_another')) === 1) { // set value so create routine will not overwrite URL: - Session::put('bills.create.fromStore', true); + $request->session()->put('bills.create.fromStore', true); return redirect(route('bills.create'))->withInput(); } @@ -258,12 +263,12 @@ class BillController extends Controller $billData = $request->getBillData(); $bill = $repository->update($bill, $billData); - Session::flash('success', strval(trans('firefly.updated_bill', ['name' => e($bill->name)]))); + $request->session()->flash('success', strval(trans('firefly.updated_bill', ['name' => e($bill->name)]))); Preferences::mark(); if (intval($request->get('return_to_edit')) === 1) { // set value so edit routine will not overwrite URL: - Session::put('bills.edit.fromUpdate', true); + $request->session()->put('bills.edit.fromUpdate', true); return redirect(route('bills.edit', [$bill->id]))->withInput(['return_to_edit' => 1]); } diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index f21bc904fa..c7c73030f7 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -29,7 +29,6 @@ use Illuminate\Http\Request; use Illuminate\Support\Collection; use Preferences; use Response; -use Session; use View; /** @@ -87,17 +86,19 @@ class BudgetController extends Controller } /** + * @param Request $request + * * @return View */ - public function create() + public function create(Request $request) { // put previous url in session if not redirect from store (not "create another"). if (session('budgets.create.fromStore') !== true) { $this->rememberPreviousUri('budgets.create.uri'); } - Session::forget('budgets.create.fromStore'); - Session::flash('gaEventCategory', 'budgets'); - Session::flash('gaEventAction', 'create'); + $request->session()->forget('budgets.create.fromStore'); + $request->session()->flash('gaEventCategory', 'budgets'); + $request->session()->flash('gaEventAction', 'create'); $subTitle = (string)trans('firefly.create_new_budget'); return view('budgets.create', compact('subTitle')); @@ -108,40 +109,42 @@ class BudgetController extends Controller * * @return View */ - public function delete(Budget $budget) + public function delete(Request $request, Budget $budget) { $subTitle = trans('firefly.delete_budget', ['name' => $budget->name]); // put previous url in session $this->rememberPreviousUri('budgets.delete.uri'); - Session::flash('gaEventCategory', 'budgets'); - Session::flash('gaEventAction', 'delete'); + $request->session()->flash('gaEventCategory', 'budgets'); + $request->session()->flash('gaEventAction', 'delete'); return view('budgets.delete', compact('budget', 'subTitle')); } /** - * @param Budget $budget + * @param Request $request + * @param Budget $budget * - * @return \Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function destroy(Budget $budget) + public function destroy(Request $request, Budget $budget) { $name = $budget->name; $this->repository->destroy($budget); - Session::flash('success', strval(trans('firefly.deleted_budget', ['name' => e($name)]))); + $request->session()->flash('success', strval(trans('firefly.deleted_budget', ['name' => e($name)]))); Preferences::mark(); return redirect($this->getPreviousUri('budgets.delete.uri')); } /** - * @param Budget $budget + * @param Request $request + * @param Budget $budget * * @return View */ - public function edit(Budget $budget) + public function edit(Request $request, Budget $budget) { $subTitle = trans('firefly.edit_budget', ['name' => $budget->name]); @@ -149,9 +152,9 @@ class BudgetController extends Controller if (session('budgets.edit.fromUpdate') !== true) { $this->rememberPreviousUri('budgets.edit.uri'); } - Session::forget('budgets.edit.fromUpdate'); - Session::flash('gaEventCategory', 'budgets'); - Session::flash('gaEventAction', 'edit'); + $request->session()->forget('budgets.edit.fromUpdate'); + $request->session()->flash('gaEventCategory', 'budgets'); + $request->session()->flash('gaEventAction', 'edit'); return view('budgets.edit', compact('budget', 'subTitle')); @@ -305,12 +308,12 @@ class BudgetController extends Controller $data = $request->getBudgetData(); $budget = $this->repository->store($data); - Session::flash('success', strval(trans('firefly.stored_new_budget', ['name' => e($budget->name)]))); + $request->session()->flash('success', strval(trans('firefly.stored_new_budget', ['name' => e($budget->name)]))); Preferences::mark(); if (intval($request->get('create_another')) === 1) { // set value so create routine will not overwrite URL: - Session::put('budgets.create.fromStore', true); + $request->session()->put('budgets.create.fromStore', true); return redirect(route('budgets.create'))->withInput(); } @@ -329,12 +332,12 @@ class BudgetController extends Controller $data = $request->getBudgetData(); $this->repository->update($budget, $data); - Session::flash('success', strval(trans('firefly.updated_budget', ['name' => e($budget->name)]))); + $request->session()->flash('success', strval(trans('firefly.updated_budget', ['name' => e($budget->name)]))); Preferences::mark(); if (intval($request->get('return_to_edit')) === 1) { // set value so edit routine will not overwrite URL: - Session::put('budgets.edit.fromUpdate', true); + $request->session()->put('budgets.edit.fromUpdate', true); return redirect(route('budgets.edit', [$budget->id]))->withInput(['return_to_edit' => 1]); } diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 2224cb3512..24a391ec4b 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -25,7 +25,6 @@ use Illuminate\Http\Request; use Illuminate\Support\Collection; use Navigation; use Preferences; -use Session; use View; /** @@ -55,63 +54,68 @@ class CategoryController extends Controller } /** + * @param Request $request + * * @return View */ - public function create() + public function create(Request $request) { if (session('categories.create.fromStore') !== true) { $this->rememberPreviousUri('categories.create.uri'); } - Session::forget('categories.create.fromStore'); - Session::flash('gaEventCategory', 'categories'); - Session::flash('gaEventAction', 'create'); + $request->session()->forget('categories.create.fromStore'); + $request->session()->flash('gaEventCategory', 'categories'); + $request->session()->flash('gaEventAction', 'create'); $subTitle = trans('firefly.create_new_category'); return view('categories.create', compact('subTitle')); } /** + * @param Request $request * @param Category $category * * @return View */ - public function delete(Category $category) + public function delete(Request $request, Category $category) { $subTitle = trans('firefly.delete_category', ['name' => $category->name]); // put previous url in session $this->rememberPreviousUri('categories.delete.uri'); - Session::flash('gaEventCategory', 'categories'); - Session::flash('gaEventAction', 'delete'); + $request->session()->flash('gaEventCategory', 'categories'); + $request->session()->flash('gaEventAction', 'delete'); return view('categories.delete', compact('category', 'subTitle')); } /** + * @param Request $request * @param CategoryRepositoryInterface $repository * @param Category $category * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function destroy(CategoryRepositoryInterface $repository, Category $category) + public function destroy(Request $request, CategoryRepositoryInterface $repository, Category $category) { $name = $category->name; $repository->destroy($category); - Session::flash('success', strval(trans('firefly.deleted_category', ['name' => e($name)]))); + $request->session()->flash('success', strval(trans('firefly.deleted_category', ['name' => e($name)]))); Preferences::mark(); return redirect($this->getPreviousUri('categories.delete.uri')); } /** + * @param Request $request * @param Category $category * * @return View */ - public function edit(Category $category) + public function edit(Request $request, Category $category) { $subTitle = trans('firefly.edit_category', ['name' => $category->name]); @@ -119,9 +123,9 @@ class CategoryController extends Controller if (session('categories.edit.fromUpdate') !== true) { $this->rememberPreviousUri('categories.edit.uri'); } - Session::forget('categories.edit.fromUpdate'); - Session::flash('gaEventCategory', 'categories'); - Session::flash('gaEventAction', 'edit'); + $request->session()->forget('categories.edit.fromUpdate'); + $request->session()->flash('gaEventCategory', 'categories'); + $request->session()->flash('gaEventAction', 'edit'); return view('categories.edit', compact('category', 'subTitle')); @@ -269,11 +273,11 @@ class CategoryController extends Controller $data = $request->getCategoryData(); $category = $repository->store($data); - Session::flash('success', strval(trans('firefly.stored_category', ['name' => e($category->name)]))); + $request->session()->flash('success', strval(trans('firefly.stored_category', ['name' => e($category->name)]))); Preferences::mark(); if (intval($request->get('create_another')) === 1) { - Session::put('categories.create.fromStore', true); + $request->session()->put('categories.create.fromStore', true); return redirect(route('categories.create'))->withInput(); } @@ -294,11 +298,11 @@ class CategoryController extends Controller $data = $request->getCategoryData(); $repository->update($category, $data); - Session::flash('success', strval(trans('firefly.updated_category', ['name' => e($category->name)]))); + $request->session()->flash('success', strval(trans('firefly.updated_category', ['name' => e($category->name)]))); Preferences::mark(); if (intval($request->get('return_to_edit')) === 1) { - Session::put('categories.edit.fromUpdate', true); + $request->session()->put('categories.edit.fromUpdate', true); return redirect(route('categories.edit', [$category->id])); } diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index 01cb6abd3e..d38e964c62 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -17,9 +17,9 @@ use Cache; use FireflyIII\Http\Requests\CurrencyFormRequest; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use Illuminate\Http\Request; use Log; use Preferences; -use Session; use View; /** @@ -52,7 +52,7 @@ class CurrencyController extends Controller /** * @return View */ - public function create() + public function create(Request $request) { $subTitleIcon = 'fa-plus'; $subTitle = trans('firefly.create_currency'); @@ -61,25 +61,26 @@ class CurrencyController extends Controller if (session('currencies.create.fromStore') !== true) { $this->rememberPreviousUri('currencies.create.uri'); } - Session::forget('currencies.create.fromStore'); - Session::flash('gaEventCategory', 'currency'); - Session::flash('gaEventAction', 'create'); + $request->session()->forget('currencies.create.fromStore'); + $request->session()->flash('gaEventCategory', 'currency'); + $request->session()->flash('gaEventAction', 'create'); return view('currencies.create', compact('subTitleIcon', 'subTitle')); } /** + * @param Request $request * @param TransactionCurrency $currency * - * @return \Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function defaultCurrency(TransactionCurrency $currency) + public function defaultCurrency(Request $request, TransactionCurrency $currency) { Preferences::set('currencyPreference', $currency->code); Preferences::mark(); - Session::flash('success', trans('firefly.new_default_currency', ['name' => $currency->name])); + $request->session()->flash('success', trans('firefly.new_default_currency', ['name' => $currency->name])); Cache::forget('FFCURRENCYSYMBOL'); Cache::forget('FFCURRENCYCODE'); @@ -94,10 +95,10 @@ class CurrencyController extends Controller * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View */ - public function delete(CurrencyRepositoryInterface $repository, TransactionCurrency $currency) + public function delete(Request $request, CurrencyRepositoryInterface $repository, TransactionCurrency $currency) { if (!$repository->canDeleteCurrency($currency)) { - Session::flash('error', trans('firefly.cannot_delete_currency', ['name' => $currency->name])); + $request->session()->flash('error', trans('firefly.cannot_delete_currency', ['name' => $currency->name])); return redirect(route('currencies.index')); } @@ -105,8 +106,8 @@ class CurrencyController extends Controller // put previous url in session $this->rememberPreviousUri('currencies.delete.uri'); - Session::flash('gaEventCategory', 'currency'); - Session::flash('gaEventAction', 'delete'); + $request->session()->flash('gaEventCategory', 'currency'); + $request->session()->flash('gaEventAction', 'delete'); $subTitle = trans('form.delete_currency', ['name' => $currency->name]); @@ -119,26 +120,27 @@ class CurrencyController extends Controller * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function destroy(CurrencyRepositoryInterface $repository, TransactionCurrency $currency) + public function destroy(Request $request, CurrencyRepositoryInterface $repository, TransactionCurrency $currency) { if (!$repository->canDeleteCurrency($currency)) { - Session::flash('error', trans('firefly.cannot_delete_currency', ['name' => $currency->name])); + $request->session()->flash('error', trans('firefly.cannot_delete_currency', ['name' => $currency->name])); return redirect(route('currencies.index')); } $repository->destroy($currency); - Session::flash('success', trans('firefly.deleted_currency', ['name' => $currency->name])); + $request->session()->flash('success', trans('firefly.deleted_currency', ['name' => $currency->name])); return redirect($this->getPreviousUri('currencies.delete.uri')); } /** + * @param Request $request * @param TransactionCurrency $currency * * @return View */ - public function edit(TransactionCurrency $currency) + public function edit(Request $request, TransactionCurrency $currency) { $subTitleIcon = 'fa-pencil'; $subTitle = trans('breadcrumbs.edit_currency', ['name' => $currency->name]); @@ -148,27 +150,28 @@ class CurrencyController extends Controller if (session('currencies.edit.fromUpdate') !== true) { $this->rememberPreviousUri('currencies.edit.uri'); } - Session::forget('currencies.edit.fromUpdate'); - Session::flash('gaEventCategory', 'currency'); - Session::flash('gaEventAction', 'edit'); + $request->session()->forget('currencies.edit.fromUpdate'); + $request->session()->flash('gaEventCategory', 'currency'); + $request->session()->flash('gaEventAction', 'edit'); return view('currencies.edit', compact('currency', 'subTitle', 'subTitleIcon')); } /** + * @param Request $request * @param CurrencyRepositoryInterface $repository * * @return View */ - public function index(CurrencyRepositoryInterface $repository) + public function index(Request $request, CurrencyRepositoryInterface $repository) { $currencies = $repository->get(); $defaultCurrency = $repository->getCurrencyByPreference(Preferences::get('currencyPreference', config('firefly.default_currency', 'EUR'))); if (!auth()->user()->hasRole('owner')) { - Session::flash('info', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')])); + $request->session()->flash('info', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')])); } @@ -192,10 +195,10 @@ class CurrencyController extends Controller $data = $request->getCurrencyData(); $currency = $repository->store($data); - Session::flash('success', trans('firefly.created_currency', ['name' => $currency->name])); + $request->session()->flash('success', trans('firefly.created_currency', ['name' => $currency->name])); if (intval($request->get('create_another')) === 1) { - Session::put('currencies.create.fromStore', true); + $request->session()->put('currencies.create.fromStore', true); return redirect(route('currencies.create'))->withInput(); } @@ -216,12 +219,12 @@ class CurrencyController extends Controller if (auth()->user()->hasRole('owner')) { $currency = $repository->update($currency, $data); } - Session::flash('success', trans('firefly.updated_currency', ['name' => $currency->name])); + $request->session()->flash('success', trans('firefly.updated_currency', ['name' => $currency->name])); Preferences::mark(); if (intval($request->get('return_to_edit')) === 1) { - Session::put('currencies.edit.fromUpdate', true); + $request->session()->put('currencies.edit.fromUpdate', true); return redirect(route('currencies.edit', [$currency->id])); } diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index 4a70121724..830c32eb78 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -190,7 +190,7 @@ class SingleController extends Controller if ($this->isOpeningBalance($transactionJournal)) { return $this->redirectToAccount($transactionJournal); } - $type = TransactionJournal::transactionTypeStr($transactionJournal); + $type = TransactionJournal::transactionTypeStr($transactionJournal); Session::flash('success', strval(trans('firefly.deleted_' . strtolower($type), ['description' => e($transactionJournal->description)]))); $repository->delete($transactionJournal); diff --git a/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php b/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php index 43cc865dc7..0b2894ef19 100644 --- a/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php +++ b/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php @@ -40,7 +40,7 @@ class RedirectIfTwoFactorAuthenticated $is2faEnabled = Preferences::get('twoFactorAuthEnabled', false)->data; $has2faSecret = !is_null(Preferences::get('twoFactorAuthSecret')); - $is2faAuthed = Session::get('twofactor-authenticated'); + $is2faAuthed = Session::get('twoFactorAuthenticated'); if ($is2faEnabled && $has2faSecret && $is2faAuthed) { return redirect('/'); } diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php index e413987334..404e2f9d2f 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepository.php +++ b/app/Repositories/RuleGroup/RuleGroupRepository.php @@ -30,14 +30,6 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface /** @var User */ private $user; - /** - * @param User $user - */ - public function setUser(User $user) - { - $this->user = $user; - } - /** * @return int */ @@ -228,6 +220,14 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * @param array $data * From 48c26c58372b952d5a0839872dc622c551094577 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 17 Feb 2017 20:14:38 +0100 Subject: [PATCH 141/276] Update test coverage --- tests/Feature/Controllers/AccountControllerTest.php | 1 + tests/Feature/Controllers/Admin/ConfigurationControllerTest.php | 1 + tests/Feature/Controllers/Admin/UserControllerTest.php | 1 + tests/Feature/Controllers/AttachmentControllerTest.php | 1 + tests/Feature/Controllers/BillControllerTest.php | 1 + tests/Feature/Controllers/BudgetControllerTest.php | 1 + tests/Feature/Controllers/CategoryControllerTest.php | 1 + tests/Feature/Controllers/Chart/AccountControllerTest.php | 1 + tests/Feature/Controllers/Chart/BillControllerTest.php | 1 + tests/Feature/Controllers/Chart/BudgetControllerTest.php | 1 + tests/Feature/Controllers/Chart/CategoryControllerTest.php | 1 + .../Feature/Controllers/Chart/CategoryReportControllerTest.php | 1 + tests/Feature/Controllers/Chart/PiggyBankControllerTest.php | 1 + tests/Feature/Controllers/Chart/ReportControllerTest.php | 1 + tests/Feature/Controllers/CurrencyControllerTest.php | 1 + tests/Feature/Controllers/ExportControllerTest.php | 1 + tests/Feature/Controllers/HomeControllerTest.php | 1 + tests/Feature/Controllers/ImportControllerTest.php | 1 + tests/Feature/Controllers/NewUserControllerTest.php | 1 + tests/Feature/Controllers/PiggyBankControllerTest.php | 2 ++ tests/Feature/Controllers/PreferencesControllerTest.php | 1 + tests/Feature/Controllers/ProfileControllerTest.php | 1 + tests/Feature/Controllers/ReportControllerTest.php | 1 + tests/Feature/Controllers/RuleControllerTest.php | 1 + tests/Feature/Controllers/RuleGroupControllerTest.php | 1 + tests/Feature/Controllers/TagControllerTest.php | 1 + tests/Feature/Controllers/Transaction/ConvertControllerTest.php | 1 + tests/Feature/Controllers/Transaction/MassControllerTest.php | 1 + tests/Feature/Controllers/Transaction/SingleControllerTest.php | 1 + tests/Feature/Controllers/Transaction/SplitControllerTest.php | 1 + tests/Feature/Controllers/TransactionControllerTest.php | 1 + 31 files changed, 32 insertions(+) diff --git a/tests/Feature/Controllers/AccountControllerTest.php b/tests/Feature/Controllers/AccountControllerTest.php index b283f3e5d6..2f7ca99259 100644 --- a/tests/Feature/Controllers/AccountControllerTest.php +++ b/tests/Feature/Controllers/AccountControllerTest.php @@ -77,6 +77,7 @@ class AccountControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\AccountController::index + * @covers \FireflyIII\Http\Controllers\AccountController::__construct * @covers \FireflyIII\Http\Controllers\AccountController::isInArray * @dataProvider dateRangeProvider * diff --git a/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php b/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php index 9cc639b5ad..5d7c0e9b4e 100644 --- a/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php +++ b/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php @@ -21,6 +21,7 @@ class ConfigurationControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\ConfigurationController::index + * @covers \FireflyIII\Http\Controllers\Admin\ConfigurationController::__construct */ public function testIndex() { diff --git a/tests/Feature/Controllers/Admin/UserControllerTest.php b/tests/Feature/Controllers/Admin/UserControllerTest.php index 1fb73886d1..0d6701be4a 100644 --- a/tests/Feature/Controllers/Admin/UserControllerTest.php +++ b/tests/Feature/Controllers/Admin/UserControllerTest.php @@ -30,6 +30,7 @@ class UserControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\UserController::index + * @covers \FireflyIII\Http\Controllers\Admin\UserController::__construct */ public function testIndex() { diff --git a/tests/Feature/Controllers/AttachmentControllerTest.php b/tests/Feature/Controllers/AttachmentControllerTest.php index 9c47c9dadc..4608209dbc 100644 --- a/tests/Feature/Controllers/AttachmentControllerTest.php +++ b/tests/Feature/Controllers/AttachmentControllerTest.php @@ -74,6 +74,7 @@ class AttachmentControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\AttachmentController::preview + * @covers \FireflyIII\Http\Controllers\AttachmentController::__construct */ public function testPreview() { diff --git a/tests/Feature/Controllers/BillControllerTest.php b/tests/Feature/Controllers/BillControllerTest.php index 840fdfea50..f8d3c20d32 100644 --- a/tests/Feature/Controllers/BillControllerTest.php +++ b/tests/Feature/Controllers/BillControllerTest.php @@ -71,6 +71,7 @@ class BillControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BillController::index + * @covers \FireflyIII\Http\Controllers\BillController::__construct */ public function testIndex() { diff --git a/tests/Feature/Controllers/BudgetControllerTest.php b/tests/Feature/Controllers/BudgetControllerTest.php index b10387cac6..47e03cc0a0 100644 --- a/tests/Feature/Controllers/BudgetControllerTest.php +++ b/tests/Feature/Controllers/BudgetControllerTest.php @@ -88,6 +88,7 @@ class BudgetControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BudgetController::index + * @covers \FireflyIII\Http\Controllers\BudgetController::__construct * @dataProvider dateRangeProvider * * @param string $range diff --git a/tests/Feature/Controllers/CategoryControllerTest.php b/tests/Feature/Controllers/CategoryControllerTest.php index c755e13d4a..2d4737df42 100644 --- a/tests/Feature/Controllers/CategoryControllerTest.php +++ b/tests/Feature/Controllers/CategoryControllerTest.php @@ -74,6 +74,7 @@ class CategoryControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\CategoryController::index + * @covers \FireflyIII\Http\Controllers\CategoryController::__construct */ public function testIndex() { diff --git a/tests/Feature/Controllers/Chart/AccountControllerTest.php b/tests/Feature/Controllers/Chart/AccountControllerTest.php index 9e4ebadd29..e94470dd4b 100644 --- a/tests/Feature/Controllers/Chart/AccountControllerTest.php +++ b/tests/Feature/Controllers/Chart/AccountControllerTest.php @@ -60,6 +60,7 @@ class AccountControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\AccountController::frontpage + * @covers \FireflyIII\Http\Controllers\Chart\AccountController::__construct * @dataProvider dateRangeProvider * * @param string $range diff --git a/tests/Feature/Controllers/Chart/BillControllerTest.php b/tests/Feature/Controllers/Chart/BillControllerTest.php index 3e590e8963..eb0f99733f 100644 --- a/tests/Feature/Controllers/Chart/BillControllerTest.php +++ b/tests/Feature/Controllers/Chart/BillControllerTest.php @@ -19,6 +19,7 @@ class BillControllerTest extends TestCase { /** * @covers \FireflyIII\Http\Controllers\Chart\BillController::frontpage + * @covers \FireflyIII\Http\Controllers\Chart\BillController::__construct * @dataProvider dateRangeProvider * * @param string $range diff --git a/tests/Feature/Controllers/Chart/BudgetControllerTest.php b/tests/Feature/Controllers/Chart/BudgetControllerTest.php index 3f1c8461ae..713962639c 100644 --- a/tests/Feature/Controllers/Chart/BudgetControllerTest.php +++ b/tests/Feature/Controllers/Chart/BudgetControllerTest.php @@ -20,6 +20,7 @@ class BudgetControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::budget + * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::__construct * @dataProvider dateRangeProvider * * @param string $range diff --git a/tests/Feature/Controllers/Chart/CategoryControllerTest.php b/tests/Feature/Controllers/Chart/CategoryControllerTest.php index 909acf3bbe..3b5a88f52a 100644 --- a/tests/Feature/Controllers/Chart/CategoryControllerTest.php +++ b/tests/Feature/Controllers/Chart/CategoryControllerTest.php @@ -23,6 +23,7 @@ class CategoryControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::all + * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::__construct * @dataProvider dateRangeProvider * * @param string $range diff --git a/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php b/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php index 7a0b53b337..8626bfa981 100644 --- a/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php @@ -19,6 +19,7 @@ class CategoryReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::accountExpense + * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::__construct */ public function testAccountExpense() { diff --git a/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php b/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php index 8d14ef24d3..68a2d0f887 100644 --- a/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php +++ b/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php @@ -18,6 +18,7 @@ class PiggyBankControllerTest extends TestCase { /** * @covers \FireflyIII\Http\Controllers\Chart\PiggyBankController::history + * @covers \FireflyIII\Http\Controllers\Chart\PiggyBankController::__construct */ public function testHistory() { diff --git a/tests/Feature/Controllers/Chart/ReportControllerTest.php b/tests/Feature/Controllers/Chart/ReportControllerTest.php index 8b556a6c2e..d42aa62364 100644 --- a/tests/Feature/Controllers/Chart/ReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/ReportControllerTest.php @@ -19,6 +19,7 @@ class ReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\ReportController::netWorth + * @covers \FireflyIII\Http\Controllers\Chart\ReportController::__construct */ public function testNetWorth() { diff --git a/tests/Feature/Controllers/CurrencyControllerTest.php b/tests/Feature/Controllers/CurrencyControllerTest.php index 5d8426ae80..f58d0a2ab0 100644 --- a/tests/Feature/Controllers/CurrencyControllerTest.php +++ b/tests/Feature/Controllers/CurrencyControllerTest.php @@ -82,6 +82,7 @@ class CurrencyControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\CurrencyController::index + * @covers \FireflyIII\Http\Controllers\CurrencyController::__construct */ public function testIndex() { diff --git a/tests/Feature/Controllers/ExportControllerTest.php b/tests/Feature/Controllers/ExportControllerTest.php index 2f9d131671..35ef4061de 100644 --- a/tests/Feature/Controllers/ExportControllerTest.php +++ b/tests/Feature/Controllers/ExportControllerTest.php @@ -48,6 +48,7 @@ class ExportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ExportController::index + * @covers \FireflyIII\Http\Controllers\ExportController::__construct */ public function testIndex() { diff --git a/tests/Feature/Controllers/HomeControllerTest.php b/tests/Feature/Controllers/HomeControllerTest.php index 32f0be8912..0b80182db1 100644 --- a/tests/Feature/Controllers/HomeControllerTest.php +++ b/tests/Feature/Controllers/HomeControllerTest.php @@ -56,6 +56,7 @@ class HomeControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\HomeController::index + * @covers \FireflyIII\Http\Controllers\HomeController::__construct * @covers \FireflyIII\Http\Controllers\Controller::__construct * @dataProvider dateRangeProvider * diff --git a/tests/Feature/Controllers/ImportControllerTest.php b/tests/Feature/Controllers/ImportControllerTest.php index c45758fe4e..bb6b2229e2 100644 --- a/tests/Feature/Controllers/ImportControllerTest.php +++ b/tests/Feature/Controllers/ImportControllerTest.php @@ -64,6 +64,7 @@ class ImportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ImportController::index + * @covers \FireflyIII\Http\Controllers\ImportController::__construct */ public function testIndex() { diff --git a/tests/Feature/Controllers/NewUserControllerTest.php b/tests/Feature/Controllers/NewUserControllerTest.php index 510f813268..042dd0587a 100644 --- a/tests/Feature/Controllers/NewUserControllerTest.php +++ b/tests/Feature/Controllers/NewUserControllerTest.php @@ -18,6 +18,7 @@ class NewUserControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\NewUserController::index + * @covers \FireflyIII\Http\Controllers\NewUserController::__construct */ public function testIndex() { diff --git a/tests/Feature/Controllers/PiggyBankControllerTest.php b/tests/Feature/Controllers/PiggyBankControllerTest.php index eeda5f5b4a..ef44d4b2a2 100644 --- a/tests/Feature/Controllers/PiggyBankControllerTest.php +++ b/tests/Feature/Controllers/PiggyBankControllerTest.php @@ -12,6 +12,7 @@ declare(strict_types = 1); namespace Tests\Feature\Controllers; use FireflyIII\Models\PiggyBank; +use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use Tests\TestCase; class PiggyBankControllerTest extends TestCase @@ -89,6 +90,7 @@ class PiggyBankControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\PiggyBankController::index + * @covers \FireflyIII\Http\Controllers\PiggyBankController::__construct */ public function testIndex() { diff --git a/tests/Feature/Controllers/PreferencesControllerTest.php b/tests/Feature/Controllers/PreferencesControllerTest.php index c3ddf6a33f..34c49aefb8 100644 --- a/tests/Feature/Controllers/PreferencesControllerTest.php +++ b/tests/Feature/Controllers/PreferencesControllerTest.php @@ -42,6 +42,7 @@ class PreferencesControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\PreferencesController::index + * @covers \FireflyIII\Http\Controllers\PreferencesController::__construct */ public function testIndex() { diff --git a/tests/Feature/Controllers/ProfileControllerTest.php b/tests/Feature/Controllers/ProfileControllerTest.php index e063012f3c..8c351fd51d 100644 --- a/tests/Feature/Controllers/ProfileControllerTest.php +++ b/tests/Feature/Controllers/ProfileControllerTest.php @@ -41,6 +41,7 @@ class ProfileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ProfileController::index + * @covers \FireflyIII\Http\Controllers\ProfileController::__construct */ public function testIndex() { diff --git a/tests/Feature/Controllers/ReportControllerTest.php b/tests/Feature/Controllers/ReportControllerTest.php index 640a754f50..b7e58cb560 100644 --- a/tests/Feature/Controllers/ReportControllerTest.php +++ b/tests/Feature/Controllers/ReportControllerTest.php @@ -62,6 +62,7 @@ class ReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ReportController::index + * @covers \FireflyIII\Http\Controllers\ReportController::__construct */ public function testIndex() { diff --git a/tests/Feature/Controllers/RuleControllerTest.php b/tests/Feature/Controllers/RuleControllerTest.php index 2cf8bf56e7..333c1923c3 100644 --- a/tests/Feature/Controllers/RuleControllerTest.php +++ b/tests/Feature/Controllers/RuleControllerTest.php @@ -80,6 +80,7 @@ class RuleControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\RuleController::index + * @covers \FireflyIII\Http\Controllers\RuleController::__construct */ public function testIndex() { diff --git a/tests/Feature/Controllers/RuleGroupControllerTest.php b/tests/Feature/Controllers/RuleGroupControllerTest.php index 514389d3eb..c3038bf15f 100644 --- a/tests/Feature/Controllers/RuleGroupControllerTest.php +++ b/tests/Feature/Controllers/RuleGroupControllerTest.php @@ -99,6 +99,7 @@ class RuleGroupControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::selectTransactions + * @covers \FireflyIII\Http\Controllers\RuleGroupController::__construct */ public function testSelectTransactions() { diff --git a/tests/Feature/Controllers/TagControllerTest.php b/tests/Feature/Controllers/TagControllerTest.php index 99e159039f..ff47501801 100644 --- a/tests/Feature/Controllers/TagControllerTest.php +++ b/tests/Feature/Controllers/TagControllerTest.php @@ -67,6 +67,7 @@ class TagControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\TagController::index + * @covers \FireflyIII\Http\Controllers\TagController::__construct */ public function testIndex() { diff --git a/tests/Feature/Controllers/Transaction/ConvertControllerTest.php b/tests/Feature/Controllers/Transaction/ConvertControllerTest.php index 48384606d3..47f8fb0070 100644 --- a/tests/Feature/Controllers/Transaction/ConvertControllerTest.php +++ b/tests/Feature/Controllers/Transaction/ConvertControllerTest.php @@ -24,6 +24,7 @@ class ConvertControllerTest extends TestCase { /** * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index + * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::__construct */ public function testIndexDepositTransfer() { diff --git a/tests/Feature/Controllers/Transaction/MassControllerTest.php b/tests/Feature/Controllers/Transaction/MassControllerTest.php index 1af0ccbd3c..09b1d6347e 100644 --- a/tests/Feature/Controllers/Transaction/MassControllerTest.php +++ b/tests/Feature/Controllers/Transaction/MassControllerTest.php @@ -19,6 +19,7 @@ class MassControllerTest extends TestCase { /** * @covers \FireflyIII\Http\Controllers\Transaction\MassController::delete + * @covers \FireflyIII\Http\Controllers\Transaction\MassController::__construct */ public function testDelete() { diff --git a/tests/Feature/Controllers/Transaction/SingleControllerTest.php b/tests/Feature/Controllers/Transaction/SingleControllerTest.php index 48b00fc2d4..29d2b5681f 100644 --- a/tests/Feature/Controllers/Transaction/SingleControllerTest.php +++ b/tests/Feature/Controllers/Transaction/SingleControllerTest.php @@ -26,6 +26,7 @@ class SingleControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::create + * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::__construct */ public function testCreate() { diff --git a/tests/Feature/Controllers/Transaction/SplitControllerTest.php b/tests/Feature/Controllers/Transaction/SplitControllerTest.php index 93a7953f77..1164571ddb 100644 --- a/tests/Feature/Controllers/Transaction/SplitControllerTest.php +++ b/tests/Feature/Controllers/Transaction/SplitControllerTest.php @@ -24,6 +24,7 @@ class SplitControllerTest extends TestCase { /** * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::edit + * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::__construct * Implement testEdit(). */ public function testEdit() diff --git a/tests/Feature/Controllers/TransactionControllerTest.php b/tests/Feature/Controllers/TransactionControllerTest.php index b9ac046c69..25171bfd85 100644 --- a/tests/Feature/Controllers/TransactionControllerTest.php +++ b/tests/Feature/Controllers/TransactionControllerTest.php @@ -18,6 +18,7 @@ class TransactionControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\TransactionController::index + * @covers \FireflyIII\Http\Controllers\TransactionController::__construct */ public function testIndex() { From f7642beb7c3dd07ce6ec60eeacbb9af1e4d31cf2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 17 Feb 2017 20:15:17 +0100 Subject: [PATCH 142/276] Better 2fa handling --- app/Handlers/Events/UserEventHandler.php | 15 --------------- app/Http/Controllers/Auth/LoginController.php | 12 ++++++++---- app/Http/Controllers/Auth/TwoFactorController.php | 11 +++++------ app/Http/Middleware/AuthenticateTwoFactor.php | 9 ++++++++- .../RedirectIfTwoFactorAuthenticated.php | 8 ++++++-- app/Providers/EventServiceProvider.php | 6 ------ 6 files changed, 27 insertions(+), 34 deletions(-) diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php index 5f86d60a57..836f7b11b5 100644 --- a/app/Handlers/Events/UserEventHandler.php +++ b/app/Handlers/Events/UserEventHandler.php @@ -19,7 +19,6 @@ use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Mail\Message; use Log; use Mail; -use Session; use Swift_TransportException; /** @@ -54,20 +53,6 @@ class UserEventHandler return true; } - /** - * Handle user logout events. - * - * @return bool - */ - public function logoutUser(): bool - { - // dump stuff from the session: - Session::forget('twoFactorAuthenticated'); - Session::forget('twoFactorAuthenticatedDate'); - - return true; - } - /** * @param RequestedNewPassword $event * diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 04e8abcc06..0072229023 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -16,6 +16,7 @@ use Config; use FireflyConfig; use FireflyIII\Http\Controllers\Controller; use FireflyIII\User; +use Illuminate\Cookie\CookieJar; use Illuminate\Foundation\Auth\AuthenticatesUsers; use Illuminate\Http\Request; use Lang; @@ -74,23 +75,26 @@ class LoginController extends Controller } /** - * @param Request $request + * @param Request $request + * @param CookieJar $cookieJar * - * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @return $this */ - public function logout(Request $request) + public function logout(Request $request, CookieJar $cookieJar) { if (intval(getenv('SANDSTORM')) === 1) { return view('error')->with('message', strval(trans('firefly.sandstorm_not_available'))); } + $cookie = $cookieJar->forever('twoFactorAuthenticated', 'false'); + $this->guard()->logout(); $request->session()->flush(); $request->session()->regenerate(); - return redirect('/'); + return redirect('/')->withCookie($cookie); } /** diff --git a/app/Http/Controllers/Auth/TwoFactorController.php b/app/Http/Controllers/Auth/TwoFactorController.php index 66df10f66e..9b74cad644 100644 --- a/app/Http/Controllers/Auth/TwoFactorController.php +++ b/app/Http/Controllers/Auth/TwoFactorController.php @@ -13,14 +13,13 @@ declare(strict_types = 1); namespace FireflyIII\Http\Controllers\Auth; -use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\TokenFormRequest; +use Illuminate\Cookie\CookieJar; use Illuminate\Http\Request; use Log; use Preferences; -use Session; /** * Class TwoFactorController @@ -84,12 +83,12 @@ class TwoFactorController extends Controller * * @return mixed */ - public function postIndex(TokenFormRequest $request) + public function postIndex(TokenFormRequest $request, CookieJar $cookieJar) { - Session::put('twoFactorAuthenticated', true); - Session::put('twoFactorAuthenticatedDate', new Carbon); + // set cookie! + $cookie = $cookieJar->forever('twoFactorAuthenticated', 'true'); - return redirect(route('home')); + return redirect(route('home'))->withCookie($cookie); } } diff --git a/app/Http/Middleware/AuthenticateTwoFactor.php b/app/Http/Middleware/AuthenticateTwoFactor.php index 4f9f1f5542..5325150bcc 100644 --- a/app/Http/Middleware/AuthenticateTwoFactor.php +++ b/app/Http/Middleware/AuthenticateTwoFactor.php @@ -14,8 +14,10 @@ declare(strict_types = 1); namespace FireflyIII\Http\Middleware; use Closure; +use Cookie; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; +use Log; use Preferences; use Session; @@ -55,8 +57,13 @@ class AuthenticateTwoFactor } $is2faEnabled = Preferences::get('twoFactorAuthEnabled', false)->data; $has2faSecret = !is_null(Preferences::get('twoFactorAuthSecret')); - $is2faAuthed = Session::get('twofactor-authenticated'); + + // grab 2auth information from cookie, not from session. + $is2faAuthed = Cookie::get('twoFactorAuthenticated') === 'true'; + if ($is2faEnabled && $has2faSecret && !$is2faAuthed) { + Log::debug('Does not seem to be 2 factor authed, redirect.'); + return redirect(route('two-factor.index')); } diff --git a/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php b/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php index 0b2894ef19..53dcaa619e 100644 --- a/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php +++ b/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php @@ -17,7 +17,8 @@ use Closure; use Illuminate\Support\Facades\Auth; use Preferences; use Session; - +use Log; +use Cookie; /** * Class RedirectIfTwoFactorAuthenticated * @@ -40,7 +41,10 @@ class RedirectIfTwoFactorAuthenticated $is2faEnabled = Preferences::get('twoFactorAuthEnabled', false)->data; $has2faSecret = !is_null(Preferences::get('twoFactorAuthSecret')); - $is2faAuthed = Session::get('twoFactorAuthenticated'); + + // grab 2auth information from cookie + $is2faAuthed = Cookie::get('twoFactorAuthenticated') === 'true'; + if ($is2faEnabled && $has2faSecret && $is2faAuthed) { return redirect('/'); } diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 215fc5978e..3fcdd8da06 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -56,12 +56,6 @@ class EventServiceProvider extends ServiceProvider 'FireflyIII\Handlers\Events\UpdatedJournalEventHandler@scanBills', 'FireflyIII\Handlers\Events\UpdatedJournalEventHandler@processRules', ], - - // LARAVEL EVENTS: - 'Illuminate\Auth\Events\Logout' => - [ - 'FireflyIII\Handlers\Events\UserEventHandler@logoutUser', - ], ]; /** From f0cb63fd48c1c44da85e60f673cf3b2c18f65082 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 18 Feb 2017 09:32:10 +0100 Subject: [PATCH 143/276] Some small optimisations. --- app/Http/Controllers/HelpController.php | 8 ++++---- database/seeds/AccountTypeSeeder.php | 3 +-- database/seeds/TransactionCurrencySeeder.php | 2 -- database/seeds/TransactionTypeSeeder.php | 3 --- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/HelpController.php b/app/Http/Controllers/HelpController.php index 24d2d75254..82846210cf 100644 --- a/app/Http/Controllers/HelpController.php +++ b/app/Http/Controllers/HelpController.php @@ -58,7 +58,8 @@ class HelpController extends Controller return Response::json($content); } - $content = $help->getFromGithub($language, $route); + $content = $help->getFromGithub($language, $route); + $notYourLanguage = '

                                                                                                                                                                                                        ' . strval(trans('firefly.help_may_not_be_your_language')) . '

                                                                                                                                                                                                        '; // get backup language content (try English): if (strlen($content) === 0) { @@ -68,12 +69,11 @@ class HelpController extends Controller $content = $help->getFromCache($route, $language); } if (!$help->inCache($route, $language)) { - $content = $help->getFromGithub($language, $route); - $content = '

                                                                                                                                                                                                        ' . strval(trans('firefly.help_may_not_be_your_language')) . '

                                                                                                                                                                                                        ' . $content; + $content = trim($notYourLanguage . $help->getFromGithub($language, $route)); } } - if (strlen($content) === 0) { + if ($content === $notYourLanguage) { $content = '

                                                                                                                                                                                                        ' . strval(trans('firefly.route_has_no_help')) . '

                                                                                                                                                                                                        '; } diff --git a/database/seeds/AccountTypeSeeder.php b/database/seeds/AccountTypeSeeder.php index 64422f3a5d..8f8690f33a 100644 --- a/database/seeds/AccountTypeSeeder.php +++ b/database/seeds/AccountTypeSeeder.php @@ -21,8 +21,6 @@ class AccountTypeSeeder extends Seeder { public function run() { - DB::table('account_types')->delete(); - AccountType::create(['type' => 'Default account']); AccountType::create(['type' => 'Cash account']); AccountType::create(['type' => 'Asset account']); @@ -31,6 +29,7 @@ class AccountTypeSeeder extends Seeder AccountType::create(['type' => 'Initial balance account']); AccountType::create(['type' => 'Beneficiary account']); AccountType::create(['type' => 'Import account']); + AccountType::create(['type' => 'Loan']); } diff --git a/database/seeds/TransactionCurrencySeeder.php b/database/seeds/TransactionCurrencySeeder.php index f1204569a3..5d8fe07845 100644 --- a/database/seeds/TransactionCurrencySeeder.php +++ b/database/seeds/TransactionCurrencySeeder.php @@ -21,8 +21,6 @@ class TransactionCurrencySeeder extends Seeder { public function run() { - DB::table('transaction_currencies')->delete(); - TransactionCurrency::create(['code' => 'EUR', 'name' => 'Euro', 'symbol' => '€', 'decimal_places' => 2]); TransactionCurrency::create(['code' => 'USD', 'name' => 'US Dollar', 'symbol' => '$', 'decimal_places' => 2]); TransactionCurrency::create(['code' => 'HUF', 'name' => 'Hungarian forint', 'symbol' => 'Ft', 'decimal_places' => 2]); diff --git a/database/seeds/TransactionTypeSeeder.php b/database/seeds/TransactionTypeSeeder.php index 690d333aba..06ff214776 100644 --- a/database/seeds/TransactionTypeSeeder.php +++ b/database/seeds/TransactionTypeSeeder.php @@ -21,9 +21,6 @@ class TransactionTypeSeeder extends Seeder { public function run() { - - DB::table('transaction_types')->delete(); - TransactionType::create(['type' => TransactionType::WITHDRAWAL]); TransactionType::create(['type' => TransactionType::DEPOSIT]); TransactionType::create(['type' => TransactionType::TRANSFER]); From 5073fd937c1ae789387a905af1cc89c3cf6691cd Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 18 Feb 2017 20:10:03 +0100 Subject: [PATCH 144/276] Expand search with a bunch of keywords for #510 --- app/Http/Controllers/SearchController.php | 68 ++++++--- app/Support/Search/Modifier.php | 108 ++++++++++++++ app/Support/Search/Search.php | 173 ++++++++++++++++++---- app/Support/Search/SearchInterface.php | 47 +++--- config/firefly.php | 2 + resources/views/search/index.twig | 161 ++++++++++++-------- 6 files changed, 426 insertions(+), 133 deletions(-) create mode 100644 app/Support/Search/Modifier.php diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 4b47777c62..17e868a2fb 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -15,6 +15,8 @@ namespace FireflyIII\Http\Controllers; use FireflyIII\Support\Search\SearchInterface; use Illuminate\Http\Request; +use Illuminate\Support\Collection; +use View; /** * Class SearchController @@ -30,44 +32,66 @@ class SearchController extends Controller { parent::__construct(); + $this->middleware( + function ($request, $next) { + View::share('mainTitleIcon', 'fa-search'); + View::share('title', trans('firefly.search')); + + return $next($request); + } + ); + } /** - * Results always come in the form of an array [results, count, fullCount] - * * @param Request $request * @param SearchInterface $searcher * - * @return $this + * @return View */ public function index(Request $request, SearchInterface $searcher) { - $minSearchLen = 1; - $subTitle = null; - $query = null; - $result = []; - $title = trans('firefly.search'); - $limit = 20; - $mainTitleIcon = 'fa-search'; + // yes, hard coded values: + $minSearchLen = 1; + $limit = 20; - // set limit for search: - $searcher->setLimit($limit); + // ui stuff: + $subTitle = ''; + + // query stuff + $query = null; + $result = []; + $rawQuery = $request->get('q'); + $hasModifiers = true; + $modifiers = []; if (!is_null($request->get('q')) && strlen($request->get('q')) >= $minSearchLen) { - $query = trim(strtolower($request->get('q'))); - $words = explode(' ', $query); - $subTitle = trans('firefly.search_results_for', ['query' => $query]); + // parse query, find modifiers: + // set limit for search + $searcher->setLimit($limit); + $searcher->parseQuery($request->get('q')); - $transactions = $searcher->searchTransactions($words); - $accounts = $searcher->searchAccounts($words); - $categories = $searcher->searchCategories($words); - $budgets = $searcher->searchBudgets($words); - $tags = $searcher->searchTags($words); - $result = ['transactions' => $transactions, 'accounts' => $accounts, 'categories' => $categories, 'budgets' => $budgets, 'tags' => $tags]; + $transactions = $searcher->searchTransactions(); + $accounts = new Collection; + $categories = new Collection; + $tags = new Collection; + $budgets = new Collection; + + // no special search thing? + if (!$searcher->hasModifiers()) { + $hasModifiers = false; + $accounts = $searcher->searchAccounts(); + $categories = $searcher->searchCategories(); + $budgets = $searcher->searchBudgets(); + $tags = $searcher->searchTags(); + } + $query = $searcher->getWordsAsString(); + $subTitle = trans('firefly.search_results_for', ['query' => $query]); + $result = ['transactions' => $transactions, 'accounts' => $accounts, 'categories' => $categories, 'budgets' => $budgets, 'tags' => $tags]; } - return view('search.index', compact('title', 'subTitle', 'limit', 'mainTitleIcon', 'query', 'result')); + return view('search.index', compact('rawQuery', 'hasModifiers', 'modifiers', 'subTitle', 'limit', 'query', 'result')); } } diff --git a/app/Support/Search/Modifier.php b/app/Support/Search/Modifier.php new file mode 100644 index 0000000000..821e34c0fe --- /dev/null +++ b/app/Support/Search/Modifier.php @@ -0,0 +1,108 @@ +transaction_amount); + + $compare = bccomp($amount, $transactionAmount); + Log::debug(sprintf('%s vs %s is %d', $amount, $transactionAmount, $compare)); + + return $compare === $expected; + } + + /** + * @param Transaction $transaction + * @param string $amount + * + * @return bool + */ + public static function amountIs(Transaction $transaction, string $amount): bool + { + return self::amountCompare($transaction, $amount, 0); + } + + /** + * @param Transaction $transaction + * @param string $amount + * + * @return bool + */ + public static function amountLess(Transaction $transaction, string $amount): bool + { + return self::amountCompare($transaction, $amount, 1); + } + + /** + * @param Transaction $transaction + * @param string $amount + * + * @return bool + */ + public static function amountMore(Transaction $transaction, string $amount): bool + { + return self::amountCompare($transaction, $amount, -1); + } + + /** + * @param Transaction $transaction + * @param string $destination + * + * @return bool + */ + public static function destination(Transaction $transaction, string $destination): bool + { + return self::stringCompare($transaction->opposing_account_name, $destination); + } + + /** + * @param Transaction $transaction + * @param string $source + * + * @return bool + */ + public static function source(Transaction $transaction, string $source): bool + { + return self::stringCompare($transaction->account_name, $source); + } + + /** + * @param string $haystack + * @param string $needle + * + * @return bool + */ + public static function stringCompare(string $haystack, string $needle): bool + { + $res = !(strpos(strtolower($haystack), strtolower($needle)) === false); + Log::debug(sprintf('"%s" is in "%s"? %s', $needle, $haystack, var_export($res, true))); + + return $res; + + } +} \ No newline at end of file diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php index b37af85daa..2063252ae3 100644 --- a/app/Support/Search/Search.php +++ b/app/Support/Search/Search.php @@ -14,6 +14,7 @@ declare(strict_types = 1); namespace FireflyIII\Support\Search; +use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; @@ -34,19 +35,64 @@ class Search implements SearchInterface { /** @var int */ private $limit = 100; + /** @var Collection */ + private $modifiers; /** @var User */ private $user; + /** @var array */ + private $validModifiers = []; + /** @var array */ + private $words = []; + + /** + * Search constructor. + */ + public function __construct() + { + $this->modifiers = new Collection; + $this->validModifiers = config('firefly.search_modifiers'); + } + + /** + * @return string + */ + public function getWordsAsString(): string + { + return join(' ', $this->words); + } + + /** + * @return bool + */ + public function hasModifiers(): bool + { + return $this->modifiers->count() > 0; + } + + /** + * @param string $query + */ + public function parseQuery(string $query) + { + $filteredQuery = $query; + $pattern = '/[a-z_]*:[0-9a-z.]*/i'; + $matches = []; + preg_match_all($pattern, $query, $matches); + + foreach ($matches[0] as $match) { + $this->extractModifier($match); + $filteredQuery = str_replace($match, '', $filteredQuery); + } + $filteredQuery = trim(str_replace(['"', "'"], '', $filteredQuery)); + $this->words = array_map('trim', explode(' ', $filteredQuery)); + } /** - * The search will assume that the user does not have so many accounts - * that this search should be paginated. - * - * @param array $words - * * @return Collection */ - public function searchAccounts(array $words): Collection + public function searchAccounts(): Collection { + $words = $this->words; $accounts = $this->user->accounts() ->accountTypeIn([AccountType::DEFAULT, AccountType::ASSET, AccountType::EXPENSE, AccountType::REVENUE, AccountType::BENEFICIARY]) ->get(['accounts.*']); @@ -67,14 +113,13 @@ class Search implements SearchInterface } /** - * @param array $words - * * @return Collection */ - public function searchBudgets(array $words): Collection + public function searchBudgets(): Collection { /** @var Collection $set */ - $set = auth()->user()->budgets()->get(); + $set = auth()->user()->budgets()->get(); + $words = $this->words; /** @var Collection $result */ $result = $set->filter( function (Budget $budget) use ($words) { @@ -92,14 +137,11 @@ class Search implements SearchInterface } /** - * Search assumes the user does not have that many categories. So no paginated search. - * - * @param array $words - * * @return Collection */ - public function searchCategories(array $words): Collection + public function searchCategories(): Collection { + $words = $this->words; $categories = $this->user->categories()->get(); /** @var Collection $result */ $result = $categories->filter( @@ -117,15 +159,12 @@ class Search implements SearchInterface } /** - * - * @param array $words - * * @return Collection */ - public function searchTags(array $words): Collection + public function searchTags(): Collection { - $tags = $this->user->tags()->get(); - + $words = $this->words; + $tags = $this->user->tags()->get(); /** @var Collection $result */ $result = $tags->filter( function (Tag $tag) use ($words) { @@ -142,11 +181,9 @@ class Search implements SearchInterface } /** - * @param array $words - * * @return Collection */ - public function searchTransactions(array $words): Collection + public function searchTransactions(): Collection { $pageSize = 100; $processed = 0; @@ -156,20 +193,17 @@ class Search implements SearchInterface /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); $collector->setUser($this->user); - $collector->setAllAssetAccounts()->setLimit($pageSize)->setPage($page); - $set = $collector->getPaginatedJournals(); + $collector->setAllAssetAccounts()->setLimit($pageSize)->setPage($page)->withOpposingAccount(); + $set = $collector->getPaginatedJournals(); + $words = $this->words; + Log::debug(sprintf('Found %d journals to check. ', $set->count())); // Filter transactions that match the given triggers. $filtered = $set->filter( function (Transaction $transaction) use ($words) { - // check descr of journal: - if ($this->strpos_arr(strtolower(strval($transaction->description)), $words)) { - return $transaction; - } - // check descr of transaction - if ($this->strpos_arr(strtolower(strval($transaction->transaction_description)), $words)) { + if ($this->matchModifiers($transaction)) { return $transaction; } @@ -201,6 +235,8 @@ class Search implements SearchInterface } while (!$reachedEndOfList && !$foundEnough); $result = $result->slice(0, $this->limit); + var_dump($result->toArray()); + exit; return $result; } @@ -221,6 +257,79 @@ class Search implements SearchInterface $this->user = $user; } + /** + * @param string $string + */ + private function extractModifier(string $string) + { + $parts = explode(':', $string); + if (count($parts) === 2 && strlen(trim(strval($parts[0]))) > 0 && strlen(trim(strval($parts[1])))) { + $type = trim(strval($parts[0])); + $value = trim(strval($parts[1])); + if (in_array($type, $this->validModifiers)) { + // filter for valid type + $this->modifiers->push(['type' => $type, 'value' => $value,]); + } + } + } + + /** + * @param Transaction $transaction + * + * @return bool + * @throws FireflyException + */ + private function matchModifiers(Transaction $transaction): bool + { + Log::debug(sprintf('Now at transaction #%d', $transaction->id)); + // first "modifier" is always the text of the search: + // check descr of journal: + if (!$this->strpos_arr(strtolower(strval($transaction->description)), $this->words) + && !$this->strpos_arr(strtolower(strval($transaction->transaction_description)), $this->words) + ) { + Log::debug('Description does not match', $this->words); + + return false; + } + + + // then a for-each and a switch for every possible other thingie. + foreach ($this->modifiers as $modifier) { + switch ($modifier['type']) { + default: + throw new FireflyException(sprintf('Search modifier "%s" is not (yet) supported. Sorry!', $modifier['type'])); + break; + case 'amount_is': + $res = Modifier::amountIs($transaction, $modifier['value']); + Log::debug(sprintf('Amount is %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'amount_less': + $res = Modifier::amountLess($transaction, $modifier['value']); + Log::debug(sprintf('Amount less than %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'amount_more': + $res = Modifier::amountMore($transaction, $modifier['value']); + Log::debug(sprintf('Amount more than %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'source': + $res = Modifier::source($transaction, $modifier['value']); + Log::debug(sprintf('Source is %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'destination': + $res = Modifier::destination($transaction, $modifier['value']); + Log::debug(sprintf('Destination is %s? %s', $modifier['value'], var_export($res, true))); + break; + + } + if ($res === false) { + return $res; + } + } + + return true; + + } + /** * @param string $haystack * @param array $needle diff --git a/app/Support/Search/SearchInterface.php b/app/Support/Search/SearchInterface.php index 918f3caee3..e3962fcfea 100644 --- a/app/Support/Search/SearchInterface.php +++ b/app/Support/Search/SearchInterface.php @@ -24,40 +24,49 @@ use Illuminate\Support\Collection; interface SearchInterface { /** - * @param array $words - * - * @return Collection + * @return string */ - public function searchAccounts(array $words): Collection; + public function getWordsAsString(): string; /** - * @param array $words - * - * @return Collection + * @return bool */ - public function searchBudgets(array $words): Collection; + public function hasModifiers(): bool; /** - * @param array $words - * - * @return Collection + * @param string $query */ - public function searchCategories(array $words): Collection; + public function parseQuery(string $query); /** - * - * @param array $words - * * @return Collection */ - public function searchTags(array $words): Collection; + public function searchAccounts(): Collection; /** - * @param array $words - * * @return Collection */ - public function searchTransactions(array $words): Collection; + public function searchBudgets(): Collection; + + /** + * @return Collection + */ + public function searchCategories(): Collection; + + /** + * @return Collection + */ + public function searchTags(): Collection; + + /** + * @return Collection + */ + public function searchTransactions(): Collection; + + /** + * @param int $limit + */ + public function setLimit(int $limit); /** * @param User $user diff --git a/config/firefly.php b/config/firefly.php index 5ffebe0c43..6844fa7a10 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -209,4 +209,6 @@ return [ ], 'default_currency' => 'EUR', 'default_language' => 'en_US', + 'search_modifiers' => ['amount_is', 'amount_less', 'amount_more', 'source', 'destination', 'category', 'budget', 'tag', 'bill', 'type', 'date_on', + 'date_before', 'date_after', 'has_attachments', 'notes',], ]; diff --git a/resources/views/search/index.twig b/resources/views/search/index.twig index e166a612c7..fc82a50940 100644 --- a/resources/views/search/index.twig +++ b/resources/views/search/index.twig @@ -16,15 +16,38 @@
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +

                                                                                                                                                                                                        {{ 'advanced_search'|_ }}

                                                                                                                                                                                                        +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +

                                                                                                                                                                                                        + There are several modifiers that you can use in your search to narrow down the results. + If you use any of these, the search will only return transactions. + Please click the -icon for more information. +

                                                                                                                                                                                                        + {# search form #} +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        + +
                                                                                                                                                                                                        + +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        + +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +

                                                                                                                                                                                                        {{ trans('firefly.results_limited', {count: limit}) }}

                                                                                                                                                                                                        - -
                                                                                                                                                                                                        - - - {% if result.transactions|length > 0 %} -
                                                                                                                                                                                                        + {% if hasModifiers %} +
                                                                                                                                                                                                        +

                                                                                                                                                                                                        {{ 'transactions'|_ }}

                                                                                                                                                                                                        @@ -37,68 +60,86 @@
                                                                                                                                                                                                        - {% endif %} - {% if result.categories|length > 0 %} -
                                                                                                                                                                                                        -
                                                                                                                                                                                                        -
                                                                                                                                                                                                        -

                                                                                                                                                                                                        {{ 'categories'|_ }}

                                                                                                                                                                                                        -
                                                                                                                                                                                                        -
                                                                                                                                                                                                        -

                                                                                                                                                                                                        - {{ trans('firefly.search_found_categories', {count: result.categories|length}) }} -

                                                                                                                                                                                                        - {% include 'search.partials.categories' %} +
                                                                                                                                                                                                        + {% else %} +
                                                                                                                                                                                                        + {% if result.transactions|length > 0 %} +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +

                                                                                                                                                                                                        {{ 'transactions'|_ }}

                                                                                                                                                                                                        +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +

                                                                                                                                                                                                        + {{ trans('firefly.search_found_transactions', {count: result.transactions|length}) }} +

                                                                                                                                                                                                        + {% include 'search.partials.transactions' with {'transactions' : result.transactions} %} +
                                                                                                                                                                                                        -
                                                                                                                                                                                                        - {% endif %} - {% if result.tags|length > 0 %} -
                                                                                                                                                                                                        -
                                                                                                                                                                                                        -
                                                                                                                                                                                                        -

                                                                                                                                                                                                        {{ 'tags'|_ }}

                                                                                                                                                                                                        -
                                                                                                                                                                                                        -
                                                                                                                                                                                                        -

                                                                                                                                                                                                        - {{ trans('firefly.search_found_tags', {count: result.tags|length}) }} -

                                                                                                                                                                                                        - {% include 'search.partials.tags' %} + {% endif %} + {% if result.categories|length > 0 %} +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +

                                                                                                                                                                                                        {{ 'categories'|_ }}

                                                                                                                                                                                                        +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +

                                                                                                                                                                                                        + {{ trans('firefly.search_found_categories', {count: result.categories|length}) }} +

                                                                                                                                                                                                        + {% include 'search.partials.categories' %} +
                                                                                                                                                                                                        -
                                                                                                                                                                                                        - {% endif %} - {% if result.accounts|length > 0 %} -
                                                                                                                                                                                                        -
                                                                                                                                                                                                        -
                                                                                                                                                                                                        -

                                                                                                                                                                                                        {{ 'accounts'|_ }}

                                                                                                                                                                                                        -
                                                                                                                                                                                                        -
                                                                                                                                                                                                        -

                                                                                                                                                                                                        - {{ trans('firefly.search_found_accounts', {count: result.accounts|length}) }} -

                                                                                                                                                                                                        - {% include 'search.partials.accounts' %} + {% endif %} + {% if result.tags|length > 0 %} +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +

                                                                                                                                                                                                        {{ 'tags'|_ }}

                                                                                                                                                                                                        +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +

                                                                                                                                                                                                        + {{ trans('firefly.search_found_tags', {count: result.tags|length}) }} +

                                                                                                                                                                                                        + {% include 'search.partials.tags' %} +
                                                                                                                                                                                                        -
                                                                                                                                                                                                        - {% endif %} - {% if result.budgets|length > 0 %} -
                                                                                                                                                                                                        -
                                                                                                                                                                                                        -
                                                                                                                                                                                                        -

                                                                                                                                                                                                        {{ 'budgets'|_ }}

                                                                                                                                                                                                        -
                                                                                                                                                                                                        -
                                                                                                                                                                                                        -

                                                                                                                                                                                                        - {{ trans('firefly.search_found_budgets', {count: result.budgets|length}) }} -

                                                                                                                                                                                                        - {% include 'search.partials.budgets' %} + {% endif %} + {% if result.accounts|length > 0 %} +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +

                                                                                                                                                                                                        {{ 'accounts'|_ }}

                                                                                                                                                                                                        +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +

                                                                                                                                                                                                        + {{ trans('firefly.search_found_accounts', {count: result.accounts|length}) }} +

                                                                                                                                                                                                        + {% include 'search.partials.accounts' %} +
                                                                                                                                                                                                        -
                                                                                                                                                                                                        - {% endif %} -
                                                                                                                                                                                                        + {% endif %} + {% if result.budgets|length > 0 %} +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +

                                                                                                                                                                                                        {{ 'budgets'|_ }}

                                                                                                                                                                                                        +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +

                                                                                                                                                                                                        + {{ trans('firefly.search_found_budgets', {count: result.budgets|length}) }} +

                                                                                                                                                                                                        + {% include 'search.partials.budgets' %} +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        + {% endif %} +
                                                                                                                                                                                                        + {% endif %} {% endif %} From b5032a7597c654235304964ac143e6fb85a87e80 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 07:34:39 +0100 Subject: [PATCH 145/276] Added a new helper function. --- .../Collector/JournalExportCollector.php | 9 +++--- app/Export/Entry/Entry.php | 21 +++--------- app/Helpers/Collector/JournalCollector.php | 4 +-- app/Repositories/Journal/JournalTasker.php | 7 ++-- app/Support/Steam.php | 16 ++++++++++ app/Support/Twig/Transaction.php | 32 ++++++------------- 6 files changed, 39 insertions(+), 50 deletions(-) diff --git a/app/Export/Collector/JournalExportCollector.php b/app/Export/Collector/JournalExportCollector.php index e9bfbca879..551880ce4f 100644 --- a/app/Export/Collector/JournalExportCollector.php +++ b/app/Export/Collector/JournalExportCollector.php @@ -19,6 +19,7 @@ use DB; use FireflyIII\Models\Transaction; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; +use Steam; /** * Class JournalExportCollector @@ -118,7 +119,7 @@ class JournalExportCollector extends BasicCollector implements CollectorInterfac ); $set->each( function ($obj) { - $obj->name = $obj->encrypted === 1 ? Crypt::decrypt($obj->name) : $obj->name; + $obj->name = Steam::decrypt(intval($obj->encrypted), $obj->name); } ); $array = []; @@ -159,7 +160,7 @@ class JournalExportCollector extends BasicCollector implements CollectorInterfac ); $set->each( function ($obj) { - $obj->name = $obj->encrypted === 1 ? Crypt::decrypt($obj->name) : $obj->name; + $obj->name = Steam::decrypt(intval($obj->encrypted), $obj->name); } ); $array = []; @@ -202,7 +203,7 @@ class JournalExportCollector extends BasicCollector implements CollectorInterfac ); $set->each( function ($obj) { - $obj->name = $obj->encrypted === 1 ? Crypt::decrypt($obj->name) : $obj->name; + $obj->name = Steam::decrypt(intval($obj->encrypted), $obj->name); } ); $array = []; @@ -243,7 +244,7 @@ class JournalExportCollector extends BasicCollector implements CollectorInterfac ); $set->each( function ($obj) { - $obj->name = $obj->encrypted === 1 ? Crypt::decrypt($obj->name) : $obj->name; + $obj->name = Steam::decrypt(intval($obj->encrypted), $obj->name); } ); $array = []; diff --git a/app/Export/Entry/Entry.php b/app/Export/Entry/Entry.php index 0afc40ada4..2fb30850d0 100644 --- a/app/Export/Entry/Entry.php +++ b/app/Export/Entry/Entry.php @@ -14,6 +14,7 @@ declare(strict_types = 1); namespace FireflyIII\Export\Entry; use Crypt; +use Steam; /** * To extend the exported object, in case of new features in Firefly III for example, @@ -73,15 +74,15 @@ final class Entry { $entry = new self; $entry->journal_id = $object->transaction_journal_id; - $entry->description = self::decrypt(intval($object->journal_encrypted), $object->journal_description); + $entry->description = Steam::decrypt(intval($object->journal_encrypted), $object->journal_description); $entry->amount = $object->amount; $entry->date = $object->date; $entry->transaction_type = $object->transaction_type; $entry->currency_code = $object->transaction_currency_code; $entry->source_account_id = $object->account_id; - $entry->source_account_name = self::decrypt(intval($object->account_name_encrypted), $object->account_name); + $entry->source_account_name = Steam::decrypt(intval($object->account_name_encrypted), $object->account_name); $entry->destination_account_id = $object->opposing_account_id; - $entry->destination_account_name = self::decrypt(intval($object->opposing_account_encrypted), $object->opposing_account_name); + $entry->destination_account_name = Steam::decrypt(intval($object->opposing_account_encrypted), $object->opposing_account_name); $entry->category_id = $object->category_id ?? ''; $entry->category_name = $object->category_name ?? ''; $entry->budget_id = $object->budget_id ?? ''; @@ -95,19 +96,5 @@ final class Entry return $entry; } - /** - * @param int $isEncrypted - * @param $value - * - * @return string - */ - protected static function decrypt(int $isEncrypted, $value) - { - if ($isEncrypted === 1) { - return Crypt::decrypt($value); - } - - return $value; - } } diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php index 3a146310fd..1603b61256 100644 --- a/app/Helpers/Collector/JournalCollector.php +++ b/app/Helpers/Collector/JournalCollector.php @@ -170,10 +170,10 @@ class JournalCollector implements JournalCollectorInterface $set->each( function (Transaction $transaction) { $transaction->date = new Carbon($transaction->date); - $transaction->description = $transaction->encrypted ? Crypt::decrypt($transaction->description) : $transaction->description; + $transaction->description = Steam::decrypt(intval($transaction->encrypted), $transaction->description); if (!is_null($transaction->bill_name)) { - $transaction->bill_name = $transaction->bill_name_encrypted ? Crypt::decrypt($transaction->bill_name) : $transaction->bill_name; + $transaction->bill_name = Steam::decrypt(intval($transaction->bill_name_encrypted), $transaction->bill_name); } try { diff --git a/app/Repositories/Journal/JournalTasker.php b/app/Repositories/Journal/JournalTasker.php index c0424242c8..7a75d8a871 100644 --- a/app/Repositories/Journal/JournalTasker.php +++ b/app/Repositories/Journal/JournalTasker.php @@ -13,7 +13,6 @@ declare(strict_types = 1); namespace FireflyIII\Repositories\Journal; -use Crypt; use DB; use FireflyIII\Models\AccountType; use FireflyIII\Models\PiggyBankEvent; @@ -23,6 +22,7 @@ use FireflyIII\User; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; +use Steam; /** * Class JournalTasker @@ -113,7 +113,7 @@ class JournalTasker implements JournalTaskerInterface 'source_amount' => $entry->amount, 'description' => $entry->description, 'source_account_id' => $entry->account_id, - 'source_account_name' => intval($entry->account_encrypted) === 1 ? Crypt::decrypt($entry->account_name) : $entry->account_name, + 'source_account_name' => Steam::decrypt(intval($entry->account_encrypted), $entry->account_name), 'source_account_type' => $entry->account_type, 'source_account_before' => $sourceBalance, 'source_account_after' => bcadd($sourceBalance, $entry->amount), @@ -121,8 +121,7 @@ class JournalTasker implements JournalTaskerInterface 'destination_amount' => bcmul($entry->amount, '-1'), 'destination_account_id' => $entry->destination_account_id, 'destination_account_type' => $entry->destination_account_type, - 'destination_account_name' => - intval($entry->destination_account_encrypted) === 1 ? Crypt::decrypt($entry->destination_account_name) : $entry->destination_account_name, + 'destination_account_name' => Steam::decrypt(intval($entry->destination_account_encrypted), $entry->destination_account_name), 'destination_account_before' => $destinationBalance, 'destination_account_after' => bcadd($destinationBalance, bcmul($entry->amount, '-1')), 'budget_id' => is_null($budget) ? 0 : $budget->id, diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 870b55566c..7693cac164 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -14,6 +14,7 @@ declare(strict_types = 1); namespace FireflyIII\Support; use Carbon\Carbon; +use Crypt; use DB; use FireflyIII\Models\Account; use FireflyIII\Models\Transaction; @@ -180,6 +181,21 @@ class Steam return $result; } + /** + * @param int $isEncrypted + * @param $value + * + * @return string + */ + public function decrypt(int $isEncrypted, string $value) + { + if ($isEncrypted === 1) { + return Crypt::decrypt($value); + } + + return $value; + } + /** * @param array $accounts * diff --git a/app/Support/Twig/Transaction.php b/app/Support/Twig/Transaction.php index 5285a8ee90..f1a0b98dd5 100644 --- a/app/Support/Twig/Transaction.php +++ b/app/Support/Twig/Transaction.php @@ -19,6 +19,7 @@ use FireflyIII\Models\AccountType; use FireflyIII\Models\Transaction as TransactionModel; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionType; +use Steam; use Twig_Extension; use Twig_SimpleFilter; use Twig_SimpleFunction; @@ -195,7 +196,7 @@ class Transaction extends Twig_Extension return new Twig_SimpleFunction( 'transactionDestinationAccount', function (TransactionModel $transaction): string { - $name = intval($transaction->account_encrypted) === 1 ? Crypt::decrypt($transaction->account_name) : $transaction->account_name; + $name = Steam::decrypt(intval($transaction->account_encrypted), $transaction->account_name); $id = intval($transaction->account_id); $type = $transaction->account_type; @@ -217,7 +218,7 @@ class Transaction extends Twig_Extension ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') ->first(['transactions.account_id', 'accounts.encrypted', 'accounts.name', 'account_types.type']); - $name = intval($other->encrypted) === 1 ? Crypt::decrypt($other->name) : $other->name; + $name = Steam::decrypt(intval($other->encrypted), $other->name); $id = $other->account_id; $type = $other->type; } @@ -269,7 +270,7 @@ class Transaction extends Twig_Extension 'transactionSourceAccount', function (TransactionModel $transaction): string { // if the amount is negative, assume that the current account (the one in $transaction) is indeed the source account. - $name = intval($transaction->account_encrypted) === 1 ? Crypt::decrypt($transaction->account_name) : $transaction->account_name; + $name = Steam::decrypt(intval($transaction->account_encrypted), $transaction->account_name); $id = intval($transaction->account_id); $type = $transaction->account_type; @@ -289,7 +290,7 @@ class Transaction extends Twig_Extension ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') ->first(['transactions.account_id', 'accounts.encrypted', 'accounts.name', 'account_types.type']); - $name = intval($other->encrypted) === 1 ? Crypt::decrypt($other->name) : $other->name; + $name = Steam::decrypt(intval($other->encrypted), $other->name); $id = $other->account_id; $type = $other->type; } @@ -337,21 +338,6 @@ class Transaction extends Twig_Extension ); } - /** - * @param int $isEncrypted - * @param string $value - * - * @return string - */ - private function encrypted(int $isEncrypted, string $value): string - { - if ($isEncrypted === 1) { - return Crypt::decrypt($value); - } - - return $value; - } - /** * @param TransactionModel $transaction * @@ -361,14 +347,14 @@ class Transaction extends Twig_Extension { // journal has a budget: if (isset($transaction->transaction_journal_budget_id)) { - $name = $this->encrypted(intval($transaction->transaction_journal_budget_encrypted), $transaction->transaction_journal_budget_name); + $name = Steam::decrypt(intval($transaction->transaction_journal_budget_encrypted), $transaction->transaction_journal_budget_name); return sprintf('%s', route('budgets.show', [$transaction->transaction_journal_budget_id]), $name, $name); } // transaction has a budget if (isset($transaction->transaction_budget_id)) { - $name = $this->encrypted(intval($transaction->transaction_budget_encrypted), $transaction->transaction_budget_name); + $name = Steam::decrypt(intval($transaction->transaction_budget_encrypted), $transaction->transaction_budget_name); return sprintf('%s', route('budgets.show', [$transaction->transaction_budget_id]), $name, $name); } @@ -400,14 +386,14 @@ class Transaction extends Twig_Extension { // journal has a category: if (isset($transaction->transaction_journal_category_id)) { - $name = $this->encrypted(intval($transaction->transaction_journal_category_encrypted), $transaction->transaction_journal_category_name); + $name = Steam::decrypt(intval($transaction->transaction_journal_category_encrypted), $transaction->transaction_journal_category_name); return sprintf('%s', route('categories.show', [$transaction->transaction_journal_category_id]), $name, $name); } // transaction has a category: if (isset($transaction->transaction_category_id)) { - $name = $this->encrypted(intval($transaction->transaction_category_encrypted), $transaction->transaction_category_name); + $name = Steam::decrypt(intval($transaction->transaction_category_encrypted), $transaction->transaction_category_name); return sprintf('%s', route('categories.show', [$transaction->transaction_category_id]), $name, $name); } From 1f6180ce5d8e17bea46d440fbe150161e5e24c9b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 07:38:51 +0100 Subject: [PATCH 146/276] Updated search modifiers. --- app/Support/Search/Modifier.php | 102 ++++++++++++++++---------------- app/Support/Search/Search.php | 33 ++--------- 2 files changed, 56 insertions(+), 79 deletions(-) diff --git a/app/Support/Search/Modifier.php b/app/Support/Search/Modifier.php index 821e34c0fe..b4e3cd5fd8 100644 --- a/app/Support/Search/Modifier.php +++ b/app/Support/Search/Modifier.php @@ -12,6 +12,7 @@ declare(strict_types = 1); namespace FireflyIII\Support\Search; +use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Transaction; use Log; use Steam; @@ -36,59 +37,40 @@ class Modifier return $compare === $expected; } - /** - * @param Transaction $transaction - * @param string $amount - * - * @return bool - */ - public static function amountIs(Transaction $transaction, string $amount): bool + public static function apply(array $modifier, Transaction $transaction): bool { - return self::amountCompare($transaction, $amount, 0); - } + switch ($modifier['type']) { + default: + throw new FireflyException(sprintf('Search modifier "%s" is not (yet) supported. Sorry!', $modifier['type'])); + break; + case 'amount_is': + $res = Modifier::amountCompare($transaction, $modifier['value'], 0); + Log::debug(sprintf('Amount is %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'amount_less': + $res = Modifier::amountCompare($transaction, $modifier['value'], 1); + Log::debug(sprintf('Amount less than %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'amount_more': + $res = Modifier::amountCompare($transaction, $modifier['value'], -1); + Log::debug(sprintf('Amount more than %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'source': + $res = Modifier::stringCompare($transaction->account_name, $modifier['value']); + Log::debug(sprintf('Source is %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'destination': + $res = Modifier::stringCompare($transaction->opposing_account_name, $modifier['value']); + Log::debug(sprintf('Destination is %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'category': + $res = Modifier::category($transaction, $modifier['value']); + Log::debug(sprintf('Category is %s? %s', $modifier['value'], var_export($res, true))); + break; - /** - * @param Transaction $transaction - * @param string $amount - * - * @return bool - */ - public static function amountLess(Transaction $transaction, string $amount): bool - { - return self::amountCompare($transaction, $amount, 1); - } + } - /** - * @param Transaction $transaction - * @param string $amount - * - * @return bool - */ - public static function amountMore(Transaction $transaction, string $amount): bool - { - return self::amountCompare($transaction, $amount, -1); - } - - /** - * @param Transaction $transaction - * @param string $destination - * - * @return bool - */ - public static function destination(Transaction $transaction, string $destination): bool - { - return self::stringCompare($transaction->opposing_account_name, $destination); - } - - /** - * @param Transaction $transaction - * @param string $source - * - * @return bool - */ - public static function source(Transaction $transaction, string $source): bool - { - return self::stringCompare($transaction->account_name, $source); + return $res; } /** @@ -105,4 +87,24 @@ class Modifier return $res; } + + /** + * @param Transaction $transaction + * @param string $search + * + * @return bool + */ + private static function category(Transaction $transaction, string $search): bool + { + $journalCategory = ''; + if (!is_null($transaction->transaction_journal_category_name)) { + $journalCategory = Steam::decrypt(intval($transaction->transaction_journal_category_encrypted), $transaction->transaction_journal_category_name); + } + $transactionCategory = ''; + if (!is_null($transaction->transaction_category_name)) { + $journalCategory = Steam::decrypt(intval($transaction->transaction_category_encrypted), $transaction->transaction_category_name); + } + + return self::stringCompare($journalCategory, $search) || self::stringCompare($transactionCategory, $search); + } } \ No newline at end of file diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php index 2063252ae3..0a0e80f566 100644 --- a/app/Support/Search/Search.php +++ b/app/Support/Search/Search.php @@ -193,8 +193,9 @@ class Search implements SearchInterface /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); $collector->setUser($this->user); - $collector->setAllAssetAccounts()->setLimit($pageSize)->setPage($page)->withOpposingAccount(); - $set = $collector->getPaginatedJournals(); + $collector->setAllAssetAccounts()->setLimit($pageSize)->setPage($page) + ->withOpposingAccount()->withCategoryInformation(); + $set = $collector->getPaginatedJournals()->getCollection(); $words = $this->words; Log::debug(sprintf('Found %d journals to check. ', $set->count())); @@ -292,35 +293,9 @@ class Search implements SearchInterface return false; } - // then a for-each and a switch for every possible other thingie. foreach ($this->modifiers as $modifier) { - switch ($modifier['type']) { - default: - throw new FireflyException(sprintf('Search modifier "%s" is not (yet) supported. Sorry!', $modifier['type'])); - break; - case 'amount_is': - $res = Modifier::amountIs($transaction, $modifier['value']); - Log::debug(sprintf('Amount is %s? %s', $modifier['value'], var_export($res, true))); - break; - case 'amount_less': - $res = Modifier::amountLess($transaction, $modifier['value']); - Log::debug(sprintf('Amount less than %s? %s', $modifier['value'], var_export($res, true))); - break; - case 'amount_more': - $res = Modifier::amountMore($transaction, $modifier['value']); - Log::debug(sprintf('Amount more than %s? %s', $modifier['value'], var_export($res, true))); - break; - case 'source': - $res = Modifier::source($transaction, $modifier['value']); - Log::debug(sprintf('Source is %s? %s', $modifier['value'], var_export($res, true))); - break; - case 'destination': - $res = Modifier::destination($transaction, $modifier['value']); - Log::debug(sprintf('Destination is %s? %s', $modifier['value'], var_export($res, true))); - break; - - } + $res = Modifier::apply($modifier, $transaction); if ($res === false) { return $res; } From a27b686446d7fc9fbf6dd92949dd5843d73c17b5 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 07:41:12 +0100 Subject: [PATCH 147/276] Add budget keyword. --- app/Support/Search/Modifier.php | 24 ++++++++++++++++++++++++ app/Support/Search/Search.php | 6 ++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/app/Support/Search/Modifier.php b/app/Support/Search/Modifier.php index b4e3cd5fd8..a79744097a 100644 --- a/app/Support/Search/Modifier.php +++ b/app/Support/Search/Modifier.php @@ -67,6 +67,10 @@ class Modifier $res = Modifier::category($transaction, $modifier['value']); Log::debug(sprintf('Category is %s? %s', $modifier['value'], var_export($res, true))); break; + case 'budget': + $res = Modifier::budget($transaction, $modifier['value']); + Log::debug(sprintf('Budget is %s? %s', $modifier['value'], var_export($res, true))); + break; } @@ -88,6 +92,26 @@ class Modifier } + /** + * @param Transaction $transaction + * @param string $search + * + * @return bool + */ + private static function budget(Transaction $transaction, string $search): bool + { + $journalBudget = ''; + if (!is_null($transaction->transaction_journal_budget_name)) { + $journalBudget = Steam::decrypt(intval($transaction->transaction_journal_budget_encrypted), $transaction->transaction_journal_budget_name); + } + $transactionBudget = ''; + if (!is_null($transaction->transaction_budget_name)) { + $journalBudget = Steam::decrypt(intval($transaction->transaction_budget_encrypted), $transaction->transaction_budget_name); + } + + return self::stringCompare($journalBudget, $search) || self::stringCompare($transactionBudget, $search); + } + /** * @param Transaction $transaction * @param string $search diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php index 0a0e80f566..add2d3fc7d 100644 --- a/app/Support/Search/Search.php +++ b/app/Support/Search/Search.php @@ -193,8 +193,10 @@ class Search implements SearchInterface /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); $collector->setUser($this->user); - $collector->setAllAssetAccounts()->setLimit($pageSize)->setPage($page) - ->withOpposingAccount()->withCategoryInformation(); + $collector->setAllAssetAccounts()->setLimit($pageSize)->setPage($page); + if($this->hasModifiers()) { + $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); + } $set = $collector->getPaginatedJournals()->getCollection(); $words = $this->words; From 711a1a1d4fe31ccbc03f6b4c937220cb60418f04 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 09:07:14 +0100 Subject: [PATCH 148/276] Final modifiers. --- app/Support/Search/Modifier.php | 74 ++++++++++++++++++++++++++++++++- app/Support/Search/Search.php | 12 ++++-- config/firefly.php | 5 ++- 3 files changed, 84 insertions(+), 7 deletions(-) diff --git a/app/Support/Search/Modifier.php b/app/Support/Search/Modifier.php index a79744097a..fe6bb2d851 100644 --- a/app/Support/Search/Modifier.php +++ b/app/Support/Search/Modifier.php @@ -12,6 +12,8 @@ declare(strict_types = 1); namespace FireflyIII\Support\Search; +use Carbon\Carbon; +use Exception; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Transaction; use Log; @@ -71,12 +73,82 @@ class Modifier $res = Modifier::budget($transaction, $modifier['value']); Log::debug(sprintf('Budget is %s? %s', $modifier['value'], var_export($res, true))); break; - + case 'bill': + $res = Modifier::stringCompare(strval($transaction->bill_name), $modifier['value']); + Log::debug(sprintf('Bill is %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'type': + $res = Modifier::stringCompare($transaction->transaction_type_type, $modifier['value']); + Log::debug(sprintf('Transaction type is %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'date': + $res = Modifier::sameDate($transaction->date, $modifier['value']); + Log::debug(sprintf('Date is %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'date_before': + $res = Modifier::dateBefore($transaction->date, $modifier['value']); + Log::debug(sprintf('Date is %s? %s', $modifier['value'], var_export($res, true))); + break; + case 'date_after': + $res = Modifier::dateAfter($transaction->date, $modifier['value']); + Log::debug(sprintf('Date is %s? %s', $modifier['value'], var_export($res, true))); + break; } return $res; } + /** + * @param Carbon $date + * @param string $compare + * + * @return bool + */ + public static function dateAfter(Carbon $date, string $compare): bool + { + try { + $compareDate = new Carbon($compare); + } catch (Exception $e) { + return false; + } + + return $date->greaterThanOrEqualTo($compareDate); + } + + /** + * @param Carbon $date + * @param string $compare + * + * @return bool + */ + public static function dateBefore(Carbon $date, string $compare): bool + { + try { + $compareDate = new Carbon($compare); + } catch (Exception $e) { + return false; + } + + return $date->lessThanOrEqualTo($compareDate); + } + + /** + * @param Carbon $date + * @param string $compare + * + * @return bool + */ + public static function sameDate(Carbon $date, string $compare): bool + { + try { + $compareDate = new Carbon($compare); + } catch (Exception $e) { + return false; + } + + return $compareDate->isSameDay($date); + } + /** * @param string $haystack * @param string $needle diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php index add2d3fc7d..4e96e3cb5b 100644 --- a/app/Support/Search/Search.php +++ b/app/Support/Search/Search.php @@ -75,7 +75,7 @@ class Search implements SearchInterface public function parseQuery(string $query) { $filteredQuery = $query; - $pattern = '/[a-z_]*:[0-9a-z.]*/i'; + $pattern = '/[a-z_]*:[0-9a-z-.]*/i'; $matches = []; preg_match_all($pattern, $query, $matches); @@ -84,7 +84,9 @@ class Search implements SearchInterface $filteredQuery = str_replace($match, '', $filteredQuery); } $filteredQuery = trim(str_replace(['"', "'"], '', $filteredQuery)); - $this->words = array_map('trim', explode(' ', $filteredQuery)); + if (strlen($filteredQuery) > 0) { + $this->words = array_map('trim', explode(' ', $filteredQuery)); + } } /** @@ -194,9 +196,10 @@ class Search implements SearchInterface $collector = app(JournalCollectorInterface::class); $collector->setUser($this->user); $collector->setAllAssetAccounts()->setLimit($pageSize)->setPage($page); - if($this->hasModifiers()) { + if ($this->hasModifiers()) { $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); } + $collector->disableInternalFilter(); $set = $collector->getPaginatedJournals()->getCollection(); $words = $this->words; @@ -287,7 +290,8 @@ class Search implements SearchInterface Log::debug(sprintf('Now at transaction #%d', $transaction->id)); // first "modifier" is always the text of the search: // check descr of journal: - if (!$this->strpos_arr(strtolower(strval($transaction->description)), $this->words) + if (count($this->words) > 0 + && !$this->strpos_arr(strtolower(strval($transaction->description)), $this->words) && !$this->strpos_arr(strtolower(strval($transaction->transaction_description)), $this->words) ) { Log::debug('Description does not match', $this->words); diff --git a/config/firefly.php b/config/firefly.php index 6844fa7a10..3d4d28d6d7 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -209,6 +209,7 @@ return [ ], 'default_currency' => 'EUR', 'default_language' => 'en_US', - 'search_modifiers' => ['amount_is', 'amount_less', 'amount_more', 'source', 'destination', 'category', 'budget', 'tag', 'bill', 'type', 'date_on', - 'date_before', 'date_after', 'has_attachments', 'notes',], + 'search_modifiers' => ['amount_is', 'amount_less', 'amount_more', 'source', 'destination', 'category', 'budget', 'bill', 'type', 'date', + 'date_before', 'date_after'], + // tag notes has_attachments ]; From bf35ecc07ada1370589af1708e1fddea7485a214 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 09:17:02 +0100 Subject: [PATCH 149/276] Fixed tests --- tests/Feature/Controllers/SearchControllerTest.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/Feature/Controllers/SearchControllerTest.php b/tests/Feature/Controllers/SearchControllerTest.php index babcefa82c..e0eeb52d6b 100644 --- a/tests/Feature/Controllers/SearchControllerTest.php +++ b/tests/Feature/Controllers/SearchControllerTest.php @@ -26,11 +26,14 @@ class SearchControllerTest extends TestCase { $search = $this->mock(SearchInterface::class); $search->shouldReceive('setLimit')->once(); - $search->shouldReceive('searchTransactions')->andReturn(new Collection)->withArgs([['test']])->once(); - $search->shouldReceive('searchBudgets')->andReturn(new Collection)->withArgs([['test']])->once(); - $search->shouldReceive('searchTags')->andReturn(new Collection)->withArgs([['test']])->once(); - $search->shouldReceive('searchCategories')->andReturn(new Collection)->withArgs([['test']])->once(); - $search->shouldReceive('searchAccounts')->andReturn(new Collection)->withArgs([['test']])->once(); + $search->shouldReceive('parseQuery')->once(); + $search->shouldReceive('hasModifiers')->once()->andReturn(false); + $search->shouldReceive('getWordsAsString')->once()->andReturn('test'); + $search->shouldReceive('searchTransactions')->andReturn(new Collection)->once(); + $search->shouldReceive('searchBudgets')->andReturn(new Collection)->once(); + $search->shouldReceive('searchTags')->andReturn(new Collection)->once(); + $search->shouldReceive('searchCategories')->andReturn(new Collection)->once(); + $search->shouldReceive('searchAccounts')->andReturn(new Collection)->once(); $this->be($this->user()); $response = $this->get(route('search.index') . '?q=test'); $response->assertStatus(200); From b149a816dd5e3840b7d188925dcd392a2fe85ac2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 09:36:51 +0100 Subject: [PATCH 150/276] Make search work. [skip ci] --- app/Support/Search/Search.php | 2 -- resources/lang/en_US/firefly.php | 2 ++ resources/views/search/index.twig | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php index 4e96e3cb5b..cc6bd5e9f3 100644 --- a/app/Support/Search/Search.php +++ b/app/Support/Search/Search.php @@ -241,8 +241,6 @@ class Search implements SearchInterface } while (!$reachedEndOfList && !$foundEnough); $result = $result->slice(0, $this->limit); - var_dump($result->toArray()); - exit; return $result; } diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 23d501fdb0..b0d2efd35f 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -26,6 +26,8 @@ return [ 'showEverything' => 'Show everything', 'never' => 'Never', 'search_results_for' => 'Search results for ":query"', + 'advanced_search' => 'Advanced search', + 'advanced_search_intro' => 'There are several modifiers that you can use in your search to narrow down the results. If you use any of these, the search will only return transactions. Please click the -icon for more information.', 'bounced_error' => 'The message sent to :email bounced, so no access for you.', 'deleted_error' => 'These credentials do not match our records.', 'general_blocked_error' => 'Your account has been disabled, so you cannot login.', diff --git a/resources/views/search/index.twig b/resources/views/search/index.twig index fc82a50940..5459b7720f 100644 --- a/resources/views/search/index.twig +++ b/resources/views/search/index.twig @@ -22,9 +22,7 @@

                                                                                                                                                                                                        - There are several modifiers that you can use in your search to narrow down the results. - If you use any of these, the search will only return transactions. - Please click the -icon for more information. + {{ 'advanced_search_intro'|_ }}

                                                                                                                                                                                                        {# search form #}
                                                                                                                                                                                                        From 91568cf9195daee3bd24cd477a019386f9143bfd Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:10 +0100 Subject: [PATCH 151/276] Translated --- resources/lang/pl_PL/passwords.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pl_PL/passwords.php b/resources/lang/pl_PL/passwords.php index 64141c8686..f3d2d44d09 100644 --- a/resources/lang/pl_PL/passwords.php +++ b/resources/lang/pl_PL/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => 'Wysłaliśmy link do resetowania hasła na twój adres email!', 'reset' => 'Twoje hasło zostało zresetowane!', 'blocked' => 'Przynajmniej próbowałeś.', -]; +]; \ No newline at end of file From 9a124bb3b26a7e0334d559a3ef7ae944720e11f5 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:12 +0100 Subject: [PATCH 152/276] New translations --- resources/lang/pl_PL/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pl_PL/validation.php b/resources/lang/pl_PL/validation.php index f1ad408cb7..107f70fe31 100644 --- a/resources/lang/pl_PL/validation.php +++ b/resources/lang/pl_PL/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => 'Pole :attribute nie istnieje w :other.', 'present' => 'Pole :attribute musi być obecne.', 'amount_zero' => 'Całkowita kwota nie może być zerem', -]; +]; \ No newline at end of file From 53bb64641bcf960d2eab769c88c7257bb4a9e390 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:13 +0100 Subject: [PATCH 153/276] Translated --- resources/lang/pl_PL/pagination.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pl_PL/pagination.php b/resources/lang/pl_PL/pagination.php index 0cdbd60741..f666586cef 100644 --- a/resources/lang/pl_PL/pagination.php +++ b/resources/lang/pl_PL/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« Poprzednia', 'next' => 'Następna »', -]; +]; \ No newline at end of file From c10148753a0f8230263fc4658e1be7baa542172d Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:14 +0100 Subject: [PATCH 154/276] New translations --- resources/lang/pl_PL/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pl_PL/list.php b/resources/lang/pl_PL/list.php index 1de98adf48..0ce37d9346 100644 --- a/resources/lang/pl_PL/list.php +++ b/resources/lang/pl_PL/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Liczba budżetów', 'rule_and_groups_count' => 'Liczba reguł i grup reguł', 'tags_count' => 'Liczba tagów', -]; +]; \ No newline at end of file From 05060cee5bab74a704f8fc39f0bb0b70f6243e4e Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:16 +0100 Subject: [PATCH 155/276] New translations --- resources/lang/pl_PL/form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pl_PL/form.php b/resources/lang/pl_PL/form.php index 792e53c89d..e5466680b7 100644 --- a/resources/lang/pl_PL/form.php +++ b/resources/lang/pl_PL/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Data płatności', 'invoice_date' => 'Data faktury', 'internal_reference' => 'Internal reference', -]; +]; \ No newline at end of file From a3e955400fbe3ce4ea2ee15a65237a0df872fa32 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:17 +0100 Subject: [PATCH 156/276] Translated --- resources/lang/pl_PL/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pl_PL/help.php b/resources/lang/pl_PL/help.php index 0639bfeea4..8b73dbc51d 100644 --- a/resources/lang/pl_PL/help.php +++ b/resources/lang/pl_PL/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => 'Pamiętaj, że każda strona ma małą ikonkę ze znakiem zapytania w prawym górnym rogu. Kliknij ją aby otrzymać dodatkowe informacje o stronie, na której się znajdujesz.', 'index' => 'indeks', 'home' => 'początek', -]; +]; \ No newline at end of file From 00f9194bfaa569df4aa4f0066911e5d4ba6852f0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:19 +0100 Subject: [PATCH 157/276] New translations --- resources/lang/pl_PL/demo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pl_PL/demo.php b/resources/lang/pl_PL/demo.php index 623854e8e0..5e19d0ed45 100644 --- a/resources/lang/pl_PL/demo.php +++ b/resources/lang/pl_PL/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Of course, any CSV file can be imported into Firefly III ', 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.', 'import-configure-configuration' => 'Konfiguracja, która widzisz poniżej jest prawidłowa dla lokalnego pliku.', -]; +]; \ No newline at end of file From fa71feb9fb76d5781c30b18b64b6a01346400ee3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:20 +0100 Subject: [PATCH 158/276] Translated --- resources/lang/pt_BR/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/auth.php b/resources/lang/pt_BR/auth.php index 15a40c990b..5a17d21cad 100644 --- a/resources/lang/pt_BR/auth.php +++ b/resources/lang/pt_BR/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => 'Essas credenciais não correspondem aos nossos registros.', 'throttle' => 'Muitas tentativas de login. Por favor, tente novamente em :seconds segundos.', -]; +]; \ No newline at end of file From 411739277d39d2f69cdbcefa3518f9c97a656386 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:21 +0100 Subject: [PATCH 159/276] Translated --- resources/lang/pt_BR/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/help.php b/resources/lang/pt_BR/help.php index 877259b46b..83268848f9 100644 --- a/resources/lang/pt_BR/help.php +++ b/resources/lang/pt_BR/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => 'Lembre-se que cada página tem um pequeno ponto de interrogação na parte superior direita. Clique nele para obter ajuda sobre a página que você está.', 'index' => 'índice', 'home' => 'casa', -]; +]; \ No newline at end of file From 9d8d54e5c8b67b0c611ba487817948baa469a61b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:23 +0100 Subject: [PATCH 160/276] New translations --- resources/lang/pt_BR/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/list.php b/resources/lang/pt_BR/list.php index 548fc9cabe..4cc4bbbd49 100644 --- a/resources/lang/pt_BR/list.php +++ b/resources/lang/pt_BR/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Número de orçamentos', 'rule_and_groups_count' => 'Número de regras e grupos de regras', 'tags_count' => 'Número de tags', -]; +]; \ No newline at end of file From 821a443e447dc765c5dd96cf8bb657d35b374189 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:24 +0100 Subject: [PATCH 161/276] New translations --- resources/lang/pt_BR/form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/form.php b/resources/lang/pt_BR/form.php index 62f0fbdca9..4d7a1cae62 100644 --- a/resources/lang/pt_BR/form.php +++ b/resources/lang/pt_BR/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Data de pagamento', 'invoice_date' => 'Data da Fatura', 'internal_reference' => 'Referência interna', -]; +]; \ No newline at end of file From 0d9a81f0e4b9460bda57272177d03648ef0f4a3b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:27 +0100 Subject: [PATCH 162/276] New translations --- resources/lang/pt_BR/firefly.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index 8493799cbb..57e33c9901 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -26,6 +26,8 @@ return [ 'showEverything' => 'Mostrar tudo', 'never' => 'Nunca', 'search_results_for' => 'Pesquisar resultados por ":query"', + 'advanced_search' => 'Advanced search', + 'advanced_search_intro' => 'There are several modifiers that you can use in your search to narrow down the results. If you use any of these, the search will only return transactions. Please click the -icon for more information.', 'bounced_error' => 'A mensagem enviado para :email ressaltado, não tem acesso para você.', 'deleted_error' => 'Estas credenciais não correspondem aos nossos registros.', 'general_blocked_error' => 'Sua conta foi desativada, você não pode entrar.', @@ -965,4 +967,4 @@ return [ // sandstorm.io errors and messages: 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', -]; +]; \ No newline at end of file From d5b1722c0c2ce2f6681a1360a0701f4510bc28ee Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:28 +0100 Subject: [PATCH 163/276] Translated --- resources/lang/pt_BR/breadcrumbs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/breadcrumbs.php b/resources/lang/pt_BR/breadcrumbs.php index 6f8a0fbefe..cd6c42b790 100644 --- a/resources/lang/pt_BR/breadcrumbs.php +++ b/resources/lang/pt_BR/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => 'Criar nova etiqueta', 'edit_tag' => 'Editar etiqueta ":tag"', 'delete_tag' => 'Apagar etiqueta ":tag"', -]; +]; \ No newline at end of file From 8d6a217f22cddb5bfc4c9b7fd09e428380213634 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:30 +0100 Subject: [PATCH 164/276] Translated --- resources/lang/pt_BR/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/config.php b/resources/lang/pt_BR/config.php index f192f5235b..297140c4ca 100644 --- a/resources/lang/pt_BR/config.php +++ b/resources/lang/pt_BR/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; +]; \ No newline at end of file From a7b99b1bb508b52fc6e9b71f7581b310b5cb2f0b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:33 +0100 Subject: [PATCH 165/276] New translations --- resources/lang/pl_PL/firefly.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php index 697fa1b08c..7a136e4ae1 100644 --- a/resources/lang/pl_PL/firefly.php +++ b/resources/lang/pl_PL/firefly.php @@ -26,6 +26,8 @@ return [ 'showEverything' => 'Pokaż wszystko', 'never' => 'Nigdy', 'search_results_for' => 'Wyniki wyszukiwania dla ":query"', + 'advanced_search' => 'Advanced search', + 'advanced_search_intro' => 'There are several modifiers that you can use in your search to narrow down the results. If you use any of these, the search will only return transactions. Please click the -icon for more information.', 'bounced_error' => 'Wiadomość wysłana na adres :email została odrzucona, więc nie ma dostępu dla Ciebie.', 'deleted_error' => 'Te poświadczenia nie zgadzają się z naszymi danymi.', 'general_blocked_error' => 'Twoje konto zostało zablokowane. Dlatego nie możesz się zalogować.', @@ -965,4 +967,4 @@ return [ // sandstorm.io errors and messages: 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', -]; +]; \ No newline at end of file From 17e669813309cb23f1ae6ce2af3f1cd6ddd34bca Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:34 +0100 Subject: [PATCH 166/276] New translations --- resources/lang/pl_PL/csv.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pl_PL/csv.php b/resources/lang/pl_PL/csv.php index 96e5ce2148..d9b1b88c79 100644 --- a/resources/lang/pl_PL/csv.php +++ b/resources/lang/pl_PL/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tagi (oddzielone spacjami)', 'column_account-number' => 'Konto aktywów (numer konta)', 'column_opposing-number' => 'Opposing account (account number)', -]; +]; \ No newline at end of file From c49caf663c3b567306c737dbc3f847103ae35ff6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:35 +0100 Subject: [PATCH 167/276] Translated --- resources/lang/de_DE/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/de_DE/help.php b/resources/lang/de_DE/help.php index 6fe068f80e..54f198a3cd 100644 --- a/resources/lang/de_DE/help.php +++ b/resources/lang/de_DE/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => 'Denken Sie daran, dass jede Seite ein kleines Fragezeichen in der oberen rechten Ecke hat. Klicken Sie darauf um Hilfe zur aktuellen Seite zu erhalten.', 'index' => 'index', 'home' => 'home', -]; +]; \ No newline at end of file From a2b0ea9c5b7ceb8c23d7612f683c3f7123985442 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:37 +0100 Subject: [PATCH 168/276] Translated --- resources/lang/de_DE/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/de_DE/list.php b/resources/lang/de_DE/list.php index 0b6e04f918..801ae0be8b 100644 --- a/resources/lang/de_DE/list.php +++ b/resources/lang/de_DE/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Anzahl Budgets', 'rule_and_groups_count' => 'Anzahl Regeln und Regelgruppen', 'tags_count' => 'Anzahl Tags', -]; +]; \ No newline at end of file From 0154183800dbf3a1499c263cb33a6ea8940fe64a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:38 +0100 Subject: [PATCH 169/276] New translations --- resources/lang/de_DE/form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php index ed179e8bcb..a5e6307e0d 100644 --- a/resources/lang/de_DE/form.php +++ b/resources/lang/de_DE/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Zahlungsdatum', 'invoice_date' => 'Rechnungsdatum', 'internal_reference' => 'Interner Verweis', -]; +]; \ No newline at end of file From 7c477239921ca108ea2f767cb3dda079921f860a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:41 +0100 Subject: [PATCH 170/276] New translations --- resources/lang/de_DE/firefly.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index e9dc2ab965..c7c9a77db5 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -26,6 +26,8 @@ return [ 'showEverything' => 'Alles anzeigen', 'never' => 'Nie', 'search_results_for' => 'Suchergebnisse für ":query"', + 'advanced_search' => 'Advanced search', + 'advanced_search_intro' => 'There are several modifiers that you can use in your search to narrow down the results. If you use any of these, the search will only return transactions. Please click the -icon for more information.', 'bounced_error' => 'Die Nachricht an :email ist nicht zustellbar, sodass Sie keinen Zugang haben.', 'deleted_error' => 'Die Zugangsdaten stimmen nicht überein.', 'general_blocked_error' => 'Ihr Benutzerkonto wurde deaktiviert, sodass Sie sich nicht anmelden können.', @@ -966,4 +968,4 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', // sandstorm.io errors and messages: 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', -]; +]; \ No newline at end of file From 10c81fdfba274b49e94c554cca3f22ff67ec87d1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:42 +0100 Subject: [PATCH 171/276] Translated --- resources/lang/de_DE/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/de_DE/config.php b/resources/lang/de_DE/config.php index 452696cfce..ef642a7e8b 100644 --- a/resources/lang/de_DE/config.php +++ b/resources/lang/de_DE/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; +]; \ No newline at end of file From eb83023864e02abb50d1eaf4ceea7a26b2065147 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:44 +0100 Subject: [PATCH 172/276] Translated --- resources/lang/de_DE/csv.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/de_DE/csv.php b/resources/lang/de_DE/csv.php index 451551ca93..fca9ee7d0f 100644 --- a/resources/lang/de_DE/csv.php +++ b/resources/lang/de_DE/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (durch Leerzeichen getrennt)', 'column_account-number' => 'Bestandskonto (Kontonr.)', 'column_opposing-number' => 'Zielkonto (Kontonr.)', -]; +]; \ No newline at end of file From f4e95bdbca5f37fa6f07173141930ea018634a61 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:45 +0100 Subject: [PATCH 173/276] Translated --- resources/lang/de_DE/pagination.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/de_DE/pagination.php b/resources/lang/de_DE/pagination.php index 2d2efd2bd0..37de9e090a 100644 --- a/resources/lang/de_DE/pagination.php +++ b/resources/lang/de_DE/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« Vorherige', 'next' => 'Nächste »', -]; +]; \ No newline at end of file From 13574d812fc8038ab53f4ab3a15a3199a40662f7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:46 +0100 Subject: [PATCH 174/276] Translated --- resources/lang/de_DE/passwords.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/de_DE/passwords.php b/resources/lang/de_DE/passwords.php index b9deea7fd9..dcc36d2e91 100644 --- a/resources/lang/de_DE/passwords.php +++ b/resources/lang/de_DE/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => 'Wir haben Ihnen einen Link zum Zurücksetzen des Passworts zugesendet!', 'reset' => 'Ihr Passwort wurde zurückgesetzt!', 'blocked' => 'Netter Versuch.', -]; +]; \ No newline at end of file From 6803707b1fc0e5d9c2504616309454ddd351f169 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:47 +0100 Subject: [PATCH 175/276] Translated --- resources/lang/pl_PL/breadcrumbs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pl_PL/breadcrumbs.php b/resources/lang/pl_PL/breadcrumbs.php index fbd869f96d..210aab7ca0 100644 --- a/resources/lang/pl_PL/breadcrumbs.php +++ b/resources/lang/pl_PL/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => 'Utwórz nowy tag', 'edit_tag' => 'Modyfikuj tag ":tag"', 'delete_tag' => 'Usuń tag ":tag"', -]; +]; \ No newline at end of file From d68c2b5b8f375cfcf9aefb462b488b7fa69aab5b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:49 +0100 Subject: [PATCH 176/276] New translations --- resources/lang/pl_PL/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pl_PL/config.php b/resources/lang/pl_PL/config.php index 38f62e9f58..3ccba5874d 100644 --- a/resources/lang/pl_PL/config.php +++ b/resources/lang/pl_PL/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; +]; \ No newline at end of file From d24e5b9ecaa7cdf3fba0d7bd6554b30a2feee179 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:50 +0100 Subject: [PATCH 177/276] Translated --- resources/lang/pl_PL/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pl_PL/auth.php b/resources/lang/pl_PL/auth.php index dabd854a8e..a7b55af932 100644 --- a/resources/lang/pl_PL/auth.php +++ b/resources/lang/pl_PL/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => 'Te poświadczenia nie zgadzają się z naszymi danymi.', 'throttle' => 'Zbyt wiele prób logowania. Spróbuj ponownie za :seconds sekund.', -]; +]; \ No newline at end of file From c737ceb63fb02762257e74f5dc14c577850ecfc0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:51 +0100 Subject: [PATCH 178/276] New translations --- resources/lang/de_DE/demo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/de_DE/demo.php b/resources/lang/de_DE/demo.php index 3a54a5a14e..24e22bfa97 100644 --- a/resources/lang/de_DE/demo.php +++ b/resources/lang/de_DE/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Natürlich kann eine CSV-Datei in Firefly III importiert werden ', 'import-configure-security' => 'Aufgrund von Sicherheitsbedenken wurde der Upload mit einer lokalen Datei ersetzt.', 'import-configure-configuration' => 'Die unten stehende Konfiguration für die lokale Datei ist korrekt.', -]; +]; \ No newline at end of file From 0bd688962b9735d7e6f34b2252e8dbe4f593cb88 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:52 +0100 Subject: [PATCH 179/276] New translations --- resources/lang/de_DE/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/de_DE/validation.php b/resources/lang/de_DE/validation.php index 472dc30487..56ca0aa328 100644 --- a/resources/lang/de_DE/validation.php +++ b/resources/lang/de_DE/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => ':attribute existiert nicht in :other.', 'present' => 'Das :attribute Feld muss vorhanden sein.', 'amount_zero' => 'Der Gesamtbetrag darf nicht Null sein', -]; +]; \ No newline at end of file From d0b3b4b18616c9987d833153d8126ffae083a677 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:54 +0100 Subject: [PATCH 180/276] Translated --- resources/lang/pt_BR/pagination.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/pagination.php b/resources/lang/pt_BR/pagination.php index 7849521349..f16e5f9bb1 100644 --- a/resources/lang/pt_BR/pagination.php +++ b/resources/lang/pt_BR/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« Anterior', 'next' => 'Próximo »', -]; +]; \ No newline at end of file From a49f8a27e283224e8d41d497df98a52b90c0b31e Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:55 +0100 Subject: [PATCH 181/276] Translated --- resources/lang/pt_BR/passwords.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/passwords.php b/resources/lang/pt_BR/passwords.php index 24863232a1..d167089a72 100644 --- a/resources/lang/pt_BR/passwords.php +++ b/resources/lang/pt_BR/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => 'Nós te enviamos um email com um link para trocar a senha!', 'reset' => 'Sua senha foi redefinida!', 'blocked' => 'Boa tentativa.', -]; +]; \ No newline at end of file From 6b92ef9d7106d80f39c7981fb91ff586236b72ab Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:56 +0100 Subject: [PATCH 182/276] New translations --- resources/lang/es_ES/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/es_ES/help.php b/resources/lang/es_ES/help.php index 5198e5510f..61210ffe41 100644 --- a/resources/lang/es_ES/help.php +++ b/resources/lang/es_ES/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.', 'index' => 'index', 'home' => 'home', -]; +]; \ No newline at end of file From bb09ea5fa27978a42c1b6c5ff0d538e08bc9f062 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:57 +0100 Subject: [PATCH 183/276] New translations --- resources/lang/es_ES/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/es_ES/list.php b/resources/lang/es_ES/list.php index 91254e401d..90625d54e6 100644 --- a/resources/lang/es_ES/list.php +++ b/resources/lang/es_ES/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Number of budgets', 'rule_and_groups_count' => 'Number of rules and rule groups', 'tags_count' => 'Number of tags', -]; +]; \ No newline at end of file From 8ee6cd6c41433d6655c5cc36adcadee214723579 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:10:59 +0100 Subject: [PATCH 184/276] New translations --- resources/lang/es_ES/form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php index 271005bc4f..ff44cbf9ef 100644 --- a/resources/lang/es_ES/form.php +++ b/resources/lang/es_ES/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Payment date', 'invoice_date' => 'Invoice date', 'internal_reference' => 'Internal reference', -]; +]; \ No newline at end of file From c1d12e512989048e0af78e8c5246b78c1966866c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:02 +0100 Subject: [PATCH 185/276] New translations --- resources/lang/es_ES/firefly.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index 23d501fdb0..73e438c75f 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -26,6 +26,8 @@ return [ 'showEverything' => 'Show everything', 'never' => 'Never', 'search_results_for' => 'Search results for ":query"', + 'advanced_search' => 'Advanced search', + 'advanced_search_intro' => 'There are several modifiers that you can use in your search to narrow down the results. If you use any of these, the search will only return transactions. Please click the -icon for more information.', 'bounced_error' => 'The message sent to :email bounced, so no access for you.', 'deleted_error' => 'These credentials do not match our records.', 'general_blocked_error' => 'Your account has been disabled, so you cannot login.', @@ -965,4 +967,4 @@ return [ // sandstorm.io errors and messages: 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', -]; +]; \ No newline at end of file From 0fde74883f0730ac2827db250d5eff1d20941abb Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:03 +0100 Subject: [PATCH 186/276] New translations --- resources/lang/es_ES/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/es_ES/config.php b/resources/lang/es_ES/config.php index f9d6c01819..223b3f8bd3 100644 --- a/resources/lang/es_ES/config.php +++ b/resources/lang/es_ES/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; +]; \ No newline at end of file From ca9cc504239744074e77220bd00a9447e4ce9138 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:05 +0100 Subject: [PATCH 187/276] New translations --- resources/lang/es_ES/csv.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/es_ES/csv.php b/resources/lang/es_ES/csv.php index 6b5abd3431..4acb52efdc 100644 --- a/resources/lang/es_ES/csv.php +++ b/resources/lang/es_ES/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (space separated)', 'column_account-number' => 'Asset account (account number)', 'column_opposing-number' => 'Opposing account (account number)', -]; +]; \ No newline at end of file From 21e61d08dd43620ea2556e4dfd39ab9018d2a54b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:06 +0100 Subject: [PATCH 188/276] New translations --- resources/lang/es_ES/pagination.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/es_ES/pagination.php b/resources/lang/es_ES/pagination.php index 9e61a6cfcc..4eeab21dee 100644 --- a/resources/lang/es_ES/pagination.php +++ b/resources/lang/es_ES/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« Previous', 'next' => 'Next »', -]; +]; \ No newline at end of file From e8e0fbc9889be7afa6224fc3a1b567c4a102bfcd Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:07 +0100 Subject: [PATCH 189/276] New translations --- resources/lang/es_ES/passwords.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/es_ES/passwords.php b/resources/lang/es_ES/passwords.php index 8e1b72506b..2e11aa92dc 100644 --- a/resources/lang/es_ES/passwords.php +++ b/resources/lang/es_ES/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => 'We have e-mailed your password reset link!', 'reset' => 'Your password has been reset!', 'blocked' => 'Nice try though.', -]; +]; \ No newline at end of file From 065620aec9d680646a50dd99dadb1e24b1612200 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:08 +0100 Subject: [PATCH 190/276] Translated --- resources/lang/pt_BR/demo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/demo.php b/resources/lang/pt_BR/demo.php index 4842ffa8fe..559620fedf 100644 --- a/resources/lang/pt_BR/demo.php +++ b/resources/lang/pt_BR/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Claro, qualquer arquivo .CSV pode ser importado em Firefly III ', 'import-configure-security' => 'Por questões de segurança, seu upload foi substituído por um arquivo local.', 'import-configure-configuration' => 'A configuração que você vê abaixo é a correta para o arquivo local.', -]; +]; \ No newline at end of file From bf33025569bffe5328c8b79a103f8eb2f63cf0e3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:09 +0100 Subject: [PATCH 191/276] Translated --- resources/lang/pt_BR/csv.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/csv.php b/resources/lang/pt_BR/csv.php index aca1e7ebc2..a1b92485f2 100644 --- a/resources/lang/pt_BR/csv.php +++ b/resources/lang/pt_BR/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (separadas por espaço)', 'column_account-number' => 'Conta de ativo (número da conta)', 'column_opposing-number' => 'Conta Contrária (número da conta)', -]; +]; \ No newline at end of file From d21187df6aef7808e558dd24ee3369133f71a70a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:12 +0100 Subject: [PATCH 192/276] Approved. Step name: Proofread --- resources/lang/nl_NL/firefly.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 4a8c0fece7..3912856722 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -26,6 +26,8 @@ return [ 'showEverything' => 'Laat alles zien', 'never' => 'Nooit', 'search_results_for' => 'Zoekresultaten voor ":query"', + 'advanced_search' => 'Advanced search', + 'advanced_search_intro' => 'There are several modifiers that you can use in your search to narrow down the results. If you use any of these, the search will only return transactions. Please click the -icon for more information.', 'bounced_error' => 'Het emailtje naar :email kwam nooit aan.', 'deleted_error' => 'Deze gegevens zijn niet correct.', 'general_blocked_error' => 'Je account is uitgeschakeld, je kan helaas niet inloggen.', @@ -454,7 +456,7 @@ return [ 'deleted_currency' => 'Valuta :name verwijderd', 'created_currency' => 'Nieuwe valuta :name opgeslagen', 'updated_currency' => 'Valuta :name bijgewerkt', - 'ask_site_owner' => 'Vraag :site_owner of deze valuta wilt toevoegen, verwijderen of wijzigen.', + 'ask_site_owner' => 'Vraag :owner of deze valuta wilt toevoegen, verwijderen of wijzigen.', 'currencies_intro' => 'Firefly III ondersteunt diverse valuta die je hier kan instellen en bewerken.', 'make_default_currency' => 'maak standaard', 'default_currency' => 'standaard', @@ -965,4 +967,4 @@ return [ // sandstorm.io errors and messages: 'sandstorm_not_available' => 'Deze functie werkt niet als je Firefly III gebruikt in combinatie met Sandstorm.IO.', -]; +]; \ No newline at end of file From 72c4ecced7ad24f39474f6139f102179e46b3b0a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:13 +0100 Subject: [PATCH 193/276] New translations --- resources/lang/es_ES/demo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/es_ES/demo.php b/resources/lang/es_ES/demo.php index 3efa9c60a3..e7f8ea934d 100644 --- a/resources/lang/es_ES/demo.php +++ b/resources/lang/es_ES/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Of course, any CSV file can be imported into Firefly III ', 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.', 'import-configure-configuration' => 'The configuration you see below is correct for the local file.', -]; +]; \ No newline at end of file From 45dfc74ab343618b06b2b9796b86c4dbf03be1aa Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:14 +0100 Subject: [PATCH 194/276] New translations --- resources/lang/es_ES/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/es_ES/validation.php b/resources/lang/es_ES/validation.php index ea21edefe4..addd0e6f39 100644 --- a/resources/lang/es_ES/validation.php +++ b/resources/lang/es_ES/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => 'The :attribute field does not exist in :other.', 'present' => 'The :attribute field must be present.', 'amount_zero' => 'The total amount cannot be zero', -]; +]; \ No newline at end of file From 8128c6aed682d09777e1d6e309f8e31899e67da5 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:16 +0100 Subject: [PATCH 195/276] New translations --- resources/lang/es_ES/breadcrumbs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/es_ES/breadcrumbs.php b/resources/lang/es_ES/breadcrumbs.php index 54cb260179..6bcf9b862d 100644 --- a/resources/lang/es_ES/breadcrumbs.php +++ b/resources/lang/es_ES/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => 'Create new tag', 'edit_tag' => 'Edit tag ":tag"', 'delete_tag' => 'Delete tag ":tag"', -]; +]; \ No newline at end of file From 4a49bf87992ad941ceb92eee234450a124449a05 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:17 +0100 Subject: [PATCH 196/276] New translations --- resources/lang/es_ES/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/es_ES/auth.php b/resources/lang/es_ES/auth.php index 7319a9d7b8..5d833b3d68 100644 --- a/resources/lang/es_ES/auth.php +++ b/resources/lang/es_ES/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => 'These credentials do not match our records.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', -]; +]; \ No newline at end of file From 19f181723af446e7166becf69de231ba2085ebc4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:18 +0100 Subject: [PATCH 197/276] New translations --- resources/lang/ru_RU/csv.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/ru_RU/csv.php b/resources/lang/ru_RU/csv.php index 2340f76ea4..37e4e88998 100644 --- a/resources/lang/ru_RU/csv.php +++ b/resources/lang/ru_RU/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (space separated)', 'column_account-number' => 'Asset account (account number)', 'column_opposing-number' => 'Opposing account (account number)', -]; +]; \ No newline at end of file From 6204e575a27710f5606adf00cef86834649cc2c2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:21 +0100 Subject: [PATCH 198/276] New translations --- resources/lang/ru_RU/firefly.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php index 23d501fdb0..73e438c75f 100644 --- a/resources/lang/ru_RU/firefly.php +++ b/resources/lang/ru_RU/firefly.php @@ -26,6 +26,8 @@ return [ 'showEverything' => 'Show everything', 'never' => 'Never', 'search_results_for' => 'Search results for ":query"', + 'advanced_search' => 'Advanced search', + 'advanced_search_intro' => 'There are several modifiers that you can use in your search to narrow down the results. If you use any of these, the search will only return transactions. Please click the -icon for more information.', 'bounced_error' => 'The message sent to :email bounced, so no access for you.', 'deleted_error' => 'These credentials do not match our records.', 'general_blocked_error' => 'Your account has been disabled, so you cannot login.', @@ -965,4 +967,4 @@ return [ // sandstorm.io errors and messages: 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', -]; +]; \ No newline at end of file From c79d0ed2765a09a5b2a8f9fbf879649ddc372d75 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:22 +0100 Subject: [PATCH 199/276] Translated --- resources/lang/ru_RU/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/ru_RU/config.php b/resources/lang/ru_RU/config.php index 72e3fc9588..4e7ce17f0f 100644 --- a/resources/lang/ru_RU/config.php +++ b/resources/lang/ru_RU/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; +]; \ No newline at end of file From 5e9a605ae4e96b579ea4132c5512e2b25194b740 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:23 +0100 Subject: [PATCH 200/276] New translations --- resources/lang/ru_RU/breadcrumbs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/ru_RU/breadcrumbs.php b/resources/lang/ru_RU/breadcrumbs.php index 317c52461b..646511cec4 100644 --- a/resources/lang/ru_RU/breadcrumbs.php +++ b/resources/lang/ru_RU/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => 'Создать новый тег', 'edit_tag' => 'Редактировать тег ":tag"', 'delete_tag' => 'Удалить тег ":tag"', -]; +]; \ No newline at end of file From c1d4caf1a9542ea5bbc9db7072e995bd984403d3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:25 +0100 Subject: [PATCH 201/276] New translations --- resources/lang/pt_BR/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/validation.php b/resources/lang/pt_BR/validation.php index 527734719f..3e4891f349 100644 --- a/resources/lang/pt_BR/validation.php +++ b/resources/lang/pt_BR/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => 'O campo :attribute não existe em :other.', 'present' => 'O campo :attribute deve estar presente.', 'amount_zero' => 'A quantidade total não pode ser zero', -]; +]; \ No newline at end of file From 13beb888c1edde89ebfba74ac74c20669148259e Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:26 +0100 Subject: [PATCH 202/276] Translated --- resources/lang/ru_RU/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/ru_RU/auth.php b/resources/lang/ru_RU/auth.php index 715498e97b..bc725bca9b 100644 --- a/resources/lang/ru_RU/auth.php +++ b/resources/lang/ru_RU/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => 'Неправильный адрес электронной почты или пароль.', 'throttle' => 'Слишком много попыток логина. Пожалуйста, попробуйте снова через :seconds секунд.', -]; +]; \ No newline at end of file From 86956969ce8da1404ed219957c80cc2f92d15af0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:28 +0100 Subject: [PATCH 203/276] New translations --- resources/lang/ru_RU/form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/ru_RU/form.php b/resources/lang/ru_RU/form.php index 271005bc4f..ff44cbf9ef 100644 --- a/resources/lang/ru_RU/form.php +++ b/resources/lang/ru_RU/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Payment date', 'invoice_date' => 'Invoice date', 'internal_reference' => 'Internal reference', -]; +]; \ No newline at end of file From 5ffa6d950075c98fc1ab04baeb0ba9b418f70992 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:29 +0100 Subject: [PATCH 204/276] New translations --- resources/lang/ru_RU/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/ru_RU/help.php b/resources/lang/ru_RU/help.php index 5198e5510f..61210ffe41 100644 --- a/resources/lang/ru_RU/help.php +++ b/resources/lang/ru_RU/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.', 'index' => 'index', 'home' => 'home', -]; +]; \ No newline at end of file From 20a7723e63d9132dcdccc3b15a840248d51378a9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:30 +0100 Subject: [PATCH 205/276] New translations --- resources/lang/ru_RU/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/ru_RU/validation.php b/resources/lang/ru_RU/validation.php index ea21edefe4..addd0e6f39 100644 --- a/resources/lang/ru_RU/validation.php +++ b/resources/lang/ru_RU/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => 'The :attribute field does not exist in :other.', 'present' => 'The :attribute field must be present.', 'amount_zero' => 'The total amount cannot be zero', -]; +]; \ No newline at end of file From e1f3bf8d456ce09e3071301d5ba8766e030f951e Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:31 +0100 Subject: [PATCH 206/276] New translations --- resources/lang/ru_RU/demo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/ru_RU/demo.php b/resources/lang/ru_RU/demo.php index 3efa9c60a3..e7f8ea934d 100644 --- a/resources/lang/ru_RU/demo.php +++ b/resources/lang/ru_RU/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Of course, any CSV file can be imported into Firefly III ', 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.', 'import-configure-configuration' => 'The configuration you see below is correct for the local file.', -]; +]; \ No newline at end of file From 0d9daaffe856e53bb3cc3e4a6af92b74c13853f1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:32 +0100 Subject: [PATCH 207/276] New translations --- resources/lang/ru_RU/passwords.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/ru_RU/passwords.php b/resources/lang/ru_RU/passwords.php index 8e1b72506b..2e11aa92dc 100644 --- a/resources/lang/ru_RU/passwords.php +++ b/resources/lang/ru_RU/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => 'We have e-mailed your password reset link!', 'reset' => 'Your password has been reset!', 'blocked' => 'Nice try though.', -]; +]; \ No newline at end of file From 5f17e411909ebd3d97a70ccdd5447ad63e882623 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:33 +0100 Subject: [PATCH 208/276] New translations --- resources/lang/ru_RU/pagination.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/ru_RU/pagination.php b/resources/lang/ru_RU/pagination.php index 9e61a6cfcc..4eeab21dee 100644 --- a/resources/lang/ru_RU/pagination.php +++ b/resources/lang/ru_RU/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« Previous', 'next' => 'Next »', -]; +]; \ No newline at end of file From 1422adac3f94f6fc22e6e102668d81c954b5209b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:35 +0100 Subject: [PATCH 209/276] New translations --- resources/lang/ru_RU/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/ru_RU/list.php b/resources/lang/ru_RU/list.php index 91254e401d..90625d54e6 100644 --- a/resources/lang/ru_RU/list.php +++ b/resources/lang/ru_RU/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Number of budgets', 'rule_and_groups_count' => 'Number of rules and rule groups', 'tags_count' => 'Number of tags', -]; +]; \ No newline at end of file From 9f515bea20c3899dd8139192c2da5a6b52f30646 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:36 +0100 Subject: [PATCH 210/276] Translated --- resources/lang/de_DE/breadcrumbs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/de_DE/breadcrumbs.php b/resources/lang/de_DE/breadcrumbs.php index 6566bd879c..0ce3f40bef 100644 --- a/resources/lang/de_DE/breadcrumbs.php +++ b/resources/lang/de_DE/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => 'Neuen Tag erstellen', 'edit_tag' => 'Bearbeite Tag ":tag"', 'delete_tag' => 'Lösche Tag ":tag"', -]; +]; \ No newline at end of file From 790d156503af9c696dada592c2cd86a45837cb5e Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:37 +0100 Subject: [PATCH 211/276] Translated --- resources/lang/de_DE/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/de_DE/auth.php b/resources/lang/de_DE/auth.php index a20bd688a1..5eff4c4e6b 100644 --- a/resources/lang/de_DE/auth.php +++ b/resources/lang/de_DE/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => 'Falscher Benutzername und/oder falsches Passwort.', 'throttle' => 'Zu viele Login-Versuche. Bitte versuchen Sie es in :seconds Sekunde(n) erneut.', -]; +]; \ No newline at end of file From 0fe437c66bd83899f16aa5853b53054fd280bc17 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:38 +0100 Subject: [PATCH 212/276] New translations --- resources/lang/zh_HK/pagination.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_HK/pagination.php b/resources/lang/zh_HK/pagination.php index 9e61a6cfcc..4eeab21dee 100644 --- a/resources/lang/zh_HK/pagination.php +++ b/resources/lang/zh_HK/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« Previous', 'next' => 'Next »', -]; +]; \ No newline at end of file From 5aa038e1958ec1a895264e1939d31925a0c0447f Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:40 +0100 Subject: [PATCH 213/276] New translations --- resources/lang/zh_HK/passwords.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_HK/passwords.php b/resources/lang/zh_HK/passwords.php index 8e1b72506b..2e11aa92dc 100644 --- a/resources/lang/zh_HK/passwords.php +++ b/resources/lang/zh_HK/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => 'We have e-mailed your password reset link!', 'reset' => 'Your password has been reset!', 'blocked' => 'Nice try though.', -]; +]; \ No newline at end of file From 33de51c4aab888d8b66fdfeab2c5b2d92ea371de Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:41 +0100 Subject: [PATCH 214/276] New translations --- resources/lang/zh_HK/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_HK/list.php b/resources/lang/zh_HK/list.php index 91254e401d..90625d54e6 100644 --- a/resources/lang/zh_HK/list.php +++ b/resources/lang/zh_HK/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Number of budgets', 'rule_and_groups_count' => 'Number of rules and rule groups', 'tags_count' => 'Number of tags', -]; +]; \ No newline at end of file From 5e764a345e88a7d773350c7792d318973f3d717c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:42 +0100 Subject: [PATCH 215/276] New translations --- resources/lang/zh_HK/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_HK/help.php b/resources/lang/zh_HK/help.php index 5198e5510f..61210ffe41 100644 --- a/resources/lang/zh_HK/help.php +++ b/resources/lang/zh_HK/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.', 'index' => 'index', 'home' => 'home', -]; +]; \ No newline at end of file From 541ed1e7647d08ae4cd21925e7a4f94695fa0541 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:45 +0100 Subject: [PATCH 216/276] New translations --- resources/lang/zh_HK/firefly.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php index 23d501fdb0..73e438c75f 100644 --- a/resources/lang/zh_HK/firefly.php +++ b/resources/lang/zh_HK/firefly.php @@ -26,6 +26,8 @@ return [ 'showEverything' => 'Show everything', 'never' => 'Never', 'search_results_for' => 'Search results for ":query"', + 'advanced_search' => 'Advanced search', + 'advanced_search_intro' => 'There are several modifiers that you can use in your search to narrow down the results. If you use any of these, the search will only return transactions. Please click the -icon for more information.', 'bounced_error' => 'The message sent to :email bounced, so no access for you.', 'deleted_error' => 'These credentials do not match our records.', 'general_blocked_error' => 'Your account has been disabled, so you cannot login.', @@ -965,4 +967,4 @@ return [ // sandstorm.io errors and messages: 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', -]; +]; \ No newline at end of file From 5d34dab2ef457bf9b4da2a4026197205cf08e255 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:46 +0100 Subject: [PATCH 217/276] New translations --- resources/lang/zh_HK/form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_HK/form.php b/resources/lang/zh_HK/form.php index 271005bc4f..ff44cbf9ef 100644 --- a/resources/lang/zh_HK/form.php +++ b/resources/lang/zh_HK/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Payment date', 'invoice_date' => 'Invoice date', 'internal_reference' => 'Internal reference', -]; +]; \ No newline at end of file From 3a1b5149824259ac5da6f1c894c184203ff29c03 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:47 +0100 Subject: [PATCH 218/276] New translations --- resources/lang/zh_HK/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_HK/validation.php b/resources/lang/zh_HK/validation.php index ea21edefe4..addd0e6f39 100644 --- a/resources/lang/zh_HK/validation.php +++ b/resources/lang/zh_HK/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => 'The :attribute field does not exist in :other.', 'present' => 'The :attribute field must be present.', 'amount_zero' => 'The total amount cannot be zero', -]; +]; \ No newline at end of file From b8c78217e864b73d5106155b68527251d60b8447 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:49 +0100 Subject: [PATCH 219/276] New translations --- resources/lang/zh_HK/demo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_HK/demo.php b/resources/lang/zh_HK/demo.php index 3efa9c60a3..e7f8ea934d 100644 --- a/resources/lang/zh_HK/demo.php +++ b/resources/lang/zh_HK/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Of course, any CSV file can be imported into Firefly III ', 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.', 'import-configure-configuration' => 'The configuration you see below is correct for the local file.', -]; +]; \ No newline at end of file From 3ddef6fe788c631c9a8c3b15b7cb371ac3b3aff0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:50 +0100 Subject: [PATCH 220/276] New translations --- resources/lang/hr_HR/csv.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/hr_HR/csv.php b/resources/lang/hr_HR/csv.php index 6b5abd3431..4acb52efdc 100644 --- a/resources/lang/hr_HR/csv.php +++ b/resources/lang/hr_HR/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (space separated)', 'column_account-number' => 'Asset account (account number)', 'column_opposing-number' => 'Opposing account (account number)', -]; +]; \ No newline at end of file From 9cd1ae1220c0cdae5dcc42e53941d74073d070ef Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:52 +0100 Subject: [PATCH 221/276] New translations --- resources/lang/hr_HR/firefly.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php index 23d501fdb0..73e438c75f 100644 --- a/resources/lang/hr_HR/firefly.php +++ b/resources/lang/hr_HR/firefly.php @@ -26,6 +26,8 @@ return [ 'showEverything' => 'Show everything', 'never' => 'Never', 'search_results_for' => 'Search results for ":query"', + 'advanced_search' => 'Advanced search', + 'advanced_search_intro' => 'There are several modifiers that you can use in your search to narrow down the results. If you use any of these, the search will only return transactions. Please click the -icon for more information.', 'bounced_error' => 'The message sent to :email bounced, so no access for you.', 'deleted_error' => 'These credentials do not match our records.', 'general_blocked_error' => 'Your account has been disabled, so you cannot login.', @@ -965,4 +967,4 @@ return [ // sandstorm.io errors and messages: 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', -]; +]; \ No newline at end of file From df39f5ab98aa573137feeb88dd474c5ca1e030fc Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:54 +0100 Subject: [PATCH 222/276] New translations --- resources/lang/hr_HR/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/hr_HR/config.php b/resources/lang/hr_HR/config.php index 19e9360ac6..61ed65512d 100644 --- a/resources/lang/hr_HR/config.php +++ b/resources/lang/hr_HR/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; +]; \ No newline at end of file From 1c0762a3dfbb0c2a756967adbbbdc85dd44acfef Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:55 +0100 Subject: [PATCH 223/276] New translations --- resources/lang/hr_HR/breadcrumbs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/hr_HR/breadcrumbs.php b/resources/lang/hr_HR/breadcrumbs.php index b6c21030e4..4b23411578 100644 --- a/resources/lang/hr_HR/breadcrumbs.php +++ b/resources/lang/hr_HR/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => 'Kreiraj novu oznaku', 'edit_tag' => 'Uredi oznaku ":tag"', 'delete_tag' => 'Obriši oznaku ":tag"', -]; +]; \ No newline at end of file From 376940e0895593608a8dcb0339a15b15e06d6e19 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:56 +0100 Subject: [PATCH 224/276] New translations --- resources/lang/hr_HR/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/hr_HR/auth.php b/resources/lang/hr_HR/auth.php index 7319a9d7b8..5d833b3d68 100644 --- a/resources/lang/hr_HR/auth.php +++ b/resources/lang/hr_HR/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => 'These credentials do not match our records.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', -]; +]; \ No newline at end of file From b181f2edf0fc3ce26332235061df64bed37d7438 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:57 +0100 Subject: [PATCH 225/276] New translations --- resources/lang/zh_HK/csv.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_HK/csv.php b/resources/lang/zh_HK/csv.php index 6b5abd3431..4acb52efdc 100644 --- a/resources/lang/zh_HK/csv.php +++ b/resources/lang/zh_HK/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (space separated)', 'column_account-number' => 'Asset account (account number)', 'column_opposing-number' => 'Opposing account (account number)', -]; +]; \ No newline at end of file From b0fd5889aa1f15a291b4aeac08571e11efddd5e0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:11:58 +0100 Subject: [PATCH 226/276] New translations --- resources/lang/zh_HK/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_HK/config.php b/resources/lang/zh_HK/config.php index b5ed958eca..827ebea3f0 100644 --- a/resources/lang/zh_HK/config.php +++ b/resources/lang/zh_HK/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; +]; \ No newline at end of file From 6eb695c5eb20138bea68d83e1344f5e511f830f6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:00 +0100 Subject: [PATCH 227/276] New translations --- resources/lang/zh_TW/form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_TW/form.php b/resources/lang/zh_TW/form.php index 9014884592..1c04418238 100644 --- a/resources/lang/zh_TW/form.php +++ b/resources/lang/zh_TW/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Payment date', 'invoice_date' => 'Invoice date', 'internal_reference' => 'Internal reference', -]; +]; \ No newline at end of file From 38dbac199d813789ccfdb9db36e22bc336542313 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:02 +0100 Subject: [PATCH 228/276] Translated --- resources/lang/zh_TW/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_TW/help.php b/resources/lang/zh_TW/help.php index 8175c162da..69a62018c7 100644 --- a/resources/lang/zh_TW/help.php +++ b/resources/lang/zh_TW/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => '每一頁在右上方有一個小問號。按一下它可以取得與頁面相關説明。', 'index' => '首頁', 'home' => '首頁', -]; +]; \ No newline at end of file From b322d67ffc54a570c073ab1304774429999d4342 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:05 +0100 Subject: [PATCH 229/276] New translations --- resources/lang/zh_TW/firefly.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index 417d1dd027..d609852336 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -26,6 +26,8 @@ return [ 'showEverything' => '全部顯示', 'never' => '從來沒有', 'search_results_for' => '":query" 的搜尋結果', + 'advanced_search' => 'Advanced search', + 'advanced_search_intro' => 'There are several modifiers that you can use in your search to narrow down the results. If you use any of these, the search will only return transactions. Please click the -icon for more information.', 'bounced_error' => '無法傳送電郵至 :email ，因此無法訪問。', 'deleted_error' => '帳號或密碼錯誤。', 'general_blocked_error' => '您的帳戶已被禁用，所以您不能登錄。', @@ -965,4 +967,4 @@ return [ // sandstorm.io errors and messages: 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', -]; +]; \ No newline at end of file From edd0dcbcefbe6cf9cd34d18b97e38fc2c67e5b98 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:06 +0100 Subject: [PATCH 230/276] New translations --- resources/lang/zh_TW/csv.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_TW/csv.php b/resources/lang/zh_TW/csv.php index f87f951bba..e94574c27b 100644 --- a/resources/lang/zh_TW/csv.php +++ b/resources/lang/zh_TW/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => '標籤 （空格分隔）', 'column_account-number' => '資產帳戶 （帳號號碼）', 'column_opposing-number' => '抵銷的帳戶 （帳號號碼）', -]; +]; \ No newline at end of file From 7c0cfc55965a605802b4b92320684eb6b1f90556 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:07 +0100 Subject: [PATCH 231/276] Translated --- resources/lang/zh_TW/breadcrumbs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_TW/breadcrumbs.php b/resources/lang/zh_TW/breadcrumbs.php index a5fe3d1755..d9fe1aac5b 100644 --- a/resources/lang/zh_TW/breadcrumbs.php +++ b/resources/lang/zh_TW/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => '建立新標籤', 'edit_tag' => '編輯標籤 ":tag"', 'delete_tag' => '刪除標籤 ":tag"', -]; +]; \ No newline at end of file From 712526f1c396006b1b5e983fcba3c97bd1285236 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:08 +0100 Subject: [PATCH 232/276] New translations --- resources/lang/zh_TW/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_TW/config.php b/resources/lang/zh_TW/config.php index b5ed958eca..827ebea3f0 100644 --- a/resources/lang/zh_TW/config.php +++ b/resources/lang/zh_TW/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; +]; \ No newline at end of file From 10813796897790119d9278e5b83a8d059acfffc9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:10 +0100 Subject: [PATCH 233/276] New translations --- resources/lang/zh_TW/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_TW/list.php b/resources/lang/zh_TW/list.php index d90f353626..d5df766461 100644 --- a/resources/lang/zh_TW/list.php +++ b/resources/lang/zh_TW/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Number of budgets', 'rule_and_groups_count' => 'Number of rules and rule groups', 'tags_count' => 'Number of tags', -]; +]; \ No newline at end of file From 6167667f9a0206d608fa994d7a09a2a1c5e344a0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:11 +0100 Subject: [PATCH 234/276] Translated --- resources/lang/zh_TW/pagination.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_TW/pagination.php b/resources/lang/zh_TW/pagination.php index d87b6631ad..a197fb74af 100644 --- a/resources/lang/zh_TW/pagination.php +++ b/resources/lang/zh_TW/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« 上一頁', 'next' => '下一頁 »', -]; +]; \ No newline at end of file From bd9fcc6e8db98dbf941aeacfd9013bb7fa4dd458 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:12 +0100 Subject: [PATCH 235/276] New translations --- resources/lang/zh_HK/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_HK/auth.php b/resources/lang/zh_HK/auth.php index 7319a9d7b8..5d833b3d68 100644 --- a/resources/lang/zh_HK/auth.php +++ b/resources/lang/zh_HK/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => 'These credentials do not match our records.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', -]; +]; \ No newline at end of file From fa8200d3e2e095a11a20f340d8881e92db045ada Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:14 +0100 Subject: [PATCH 236/276] New translations --- resources/lang/zh_HK/breadcrumbs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_HK/breadcrumbs.php b/resources/lang/zh_HK/breadcrumbs.php index 54cb260179..6bcf9b862d 100644 --- a/resources/lang/zh_HK/breadcrumbs.php +++ b/resources/lang/zh_HK/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => 'Create new tag', 'edit_tag' => 'Edit tag ":tag"', 'delete_tag' => 'Delete tag ":tag"', -]; +]; \ No newline at end of file From 1aa8e43bdff6380ec08320704fdd1f4027a43695 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:15 +0100 Subject: [PATCH 237/276] New translations --- resources/lang/zh_TW/demo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_TW/demo.php b/resources/lang/zh_TW/demo.php index 3efa9c60a3..e7f8ea934d 100644 --- a/resources/lang/zh_TW/demo.php +++ b/resources/lang/zh_TW/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Of course, any CSV file can be imported into Firefly III ', 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.', 'import-configure-configuration' => 'The configuration you see below is correct for the local file.', -]; +]; \ No newline at end of file From aa1700b7b485e0b5ce0122fc3ecc6dc8ffc0e282 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:16 +0100 Subject: [PATCH 238/276] New translations --- resources/lang/zh_TW/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_TW/validation.php b/resources/lang/zh_TW/validation.php index de535f4652..f1593f0b18 100644 --- a/resources/lang/zh_TW/validation.php +++ b/resources/lang/zh_TW/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => 'The :attribute field does not exist in :other.', 'present' => 'The :attribute field must be present.', 'amount_zero' => 'The total amount cannot be zero', -]; +]; \ No newline at end of file From 73c88aa11fbd8a6037e4f0a743fb28790e207bcb Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:18 +0100 Subject: [PATCH 239/276] Translated --- resources/lang/zh_TW/passwords.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_TW/passwords.php b/resources/lang/zh_TW/passwords.php index 4f28fe3fb0..ae5f0cc2a9 100644 --- a/resources/lang/zh_TW/passwords.php +++ b/resources/lang/zh_TW/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => '我們已經將密碼重置連結發送至您的電郵！', 'reset' => '你的密碼已經被重置！', 'blocked' => '好一個嘗試。', -]; +]; \ No newline at end of file From b872bbbb42c35338f9d954f403894a641553e47e Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:19 +0100 Subject: [PATCH 240/276] New translations --- resources/lang/hr_HR/form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/hr_HR/form.php b/resources/lang/hr_HR/form.php index 271005bc4f..ff44cbf9ef 100644 --- a/resources/lang/hr_HR/form.php +++ b/resources/lang/hr_HR/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Payment date', 'invoice_date' => 'Invoice date', 'internal_reference' => 'Internal reference', -]; +]; \ No newline at end of file From 48fcb76ba4955d512696fab3aea9d782c0a74661 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:21 +0100 Subject: [PATCH 241/276] New translations --- resources/lang/hr_HR/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/hr_HR/help.php b/resources/lang/hr_HR/help.php index 5198e5510f..61210ffe41 100644 --- a/resources/lang/hr_HR/help.php +++ b/resources/lang/hr_HR/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.', 'index' => 'index', 'home' => 'home', -]; +]; \ No newline at end of file From 579ee9f199bb8afa949f4c173fe4ed334469b477 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:22 +0100 Subject: [PATCH 242/276] New translations --- resources/lang/fr_FR/csv.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php index 1bb3e6666d..2da66f7da6 100644 --- a/resources/lang/fr_FR/csv.php +++ b/resources/lang/fr_FR/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags(séparé par des espaces)', 'column_account-number' => 'Compte d’actif (numéro de compte)', 'column_opposing-number' => 'Compte destination (numéro de compte)', -]; +]; \ No newline at end of file From 26751e10eec00ed732bfb5f2013c605ec8abb93c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:24 +0100 Subject: [PATCH 243/276] Expand modifiers --- app/Support/Search/Modifier.php | 3 +++ config/firefly.php | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Support/Search/Modifier.php b/app/Support/Search/Modifier.php index fe6bb2d851..3f1e514686 100644 --- a/app/Support/Search/Modifier.php +++ b/app/Support/Search/Modifier.php @@ -45,14 +45,17 @@ class Modifier default: throw new FireflyException(sprintf('Search modifier "%s" is not (yet) supported. Sorry!', $modifier['type'])); break; + case 'amount': case 'amount_is': $res = Modifier::amountCompare($transaction, $modifier['value'], 0); Log::debug(sprintf('Amount is %s? %s', $modifier['value'], var_export($res, true))); break; + case 'amount_min': case 'amount_less': $res = Modifier::amountCompare($transaction, $modifier['value'], 1); Log::debug(sprintf('Amount less than %s? %s', $modifier['value'], var_export($res, true))); break; + case 'amount_max': case 'amount_more': $res = Modifier::amountCompare($transaction, $modifier['value'], -1); Log::debug(sprintf('Amount more than %s? %s', $modifier['value'], var_export($res, true))); diff --git a/config/firefly.php b/config/firefly.php index 3d4d28d6d7..0172e2d6ea 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -209,7 +209,7 @@ return [ ], 'default_currency' => 'EUR', 'default_language' => 'en_US', - 'search_modifiers' => ['amount_is', 'amount_less', 'amount_more', 'source', 'destination', 'category', 'budget', 'bill', 'type', 'date', - 'date_before', 'date_after'], + 'search_modifiers' => ['amount_is', 'amount', 'amount_max', 'amount_min', 'amount_less', 'amount_more', 'source', 'destination', 'category', + 'budget', 'bill', 'type', 'date', 'date_before', 'date_after'], // tag notes has_attachments ]; From 8914bd6b9a37ed81db74207b304ab19134a2f300 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:25 +0100 Subject: [PATCH 244/276] New translations --- resources/lang/fr_FR/firefly.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 1780701658..73f7e6e223 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -26,6 +26,8 @@ return [ 'showEverything' => 'Tout Afficher', 'never' => 'Jamais', 'search_results_for' => 'Résultats de recherche pour ":query"', + 'advanced_search' => 'Advanced search', + 'advanced_search_intro' => 'There are several modifiers that you can use in your search to narrow down the results. If you use any of these, the search will only return transactions. Please click the -icon for more information.', 'bounced_error' => 'Le message envoyé à :email a été rejeté, donc pas d\'accès pour vous.', 'deleted_error' => 'Ces informations d\'identification ne sont pas présentes dans nos données.', 'general_blocked_error' => 'Votre compte a été désactivé, vous ne pouvez plus vous connecter.', @@ -965,4 +967,4 @@ return [ // sandstorm.io errors and messages: 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', -]; +]; \ No newline at end of file From b0e70c25d0a9659746486b8dcd1d2291d143319b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:26 +0100 Subject: [PATCH 245/276] New translations --- resources/lang/fr_FR/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/config.php b/resources/lang/fr_FR/config.php index 94db8183c0..c5214455e4 100644 --- a/resources/lang/fr_FR/config.php +++ b/resources/lang/fr_FR/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; +]; \ No newline at end of file From a95a265d47466b407af86bd6d8f67eaa2927c716 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:27 +0100 Subject: [PATCH 246/276] Translated --- resources/lang/fr_FR/breadcrumbs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/breadcrumbs.php b/resources/lang/fr_FR/breadcrumbs.php index 2f4b250674..5211db8cfe 100644 --- a/resources/lang/fr_FR/breadcrumbs.php +++ b/resources/lang/fr_FR/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => 'Créer un nouveau tag', 'edit_tag' => 'Éditer le tag ":tag"', 'delete_tag' => 'Supprimer le tag ":tag"', -]; +]; \ No newline at end of file From 4eca99b745ae025446a69d8b0400c9dfc5fa5922 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:29 +0100 Subject: [PATCH 247/276] New translations --- resources/lang/nl_NL/demo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/nl_NL/demo.php b/resources/lang/nl_NL/demo.php index f50aa30c9a..ff2c7b4b54 100644 --- a/resources/lang/nl_NL/demo.php +++ b/resources/lang/nl_NL/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Of course, any CSV file can be imported into Firefly III ', 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.', 'import-configure-configuration' => 'The configuration you see below is correct for the local file.', -]; +]; \ No newline at end of file From 66abb50d23edcb581368b5c2b1f5ac12cb08e41c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:30 +0100 Subject: [PATCH 248/276] Translated --- resources/lang/fr_FR/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/auth.php b/resources/lang/fr_FR/auth.php index 4b87a3d12c..7fc7beebaa 100644 --- a/resources/lang/fr_FR/auth.php +++ b/resources/lang/fr_FR/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => 'Ces identifiants n\'ont aucune correspondance.', 'throttle' => 'Trop de tentatives de connexion. Veuillez essayer à nouveau dans :seconds secondes.', -]; +]; \ No newline at end of file From aadb9addd5cd905e61538dfdb10f7a815145e049 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:31 +0100 Subject: [PATCH 249/276] New translations --- resources/lang/fr_FR/form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/form.php b/resources/lang/fr_FR/form.php index 9e14815256..e833b5995a 100644 --- a/resources/lang/fr_FR/form.php +++ b/resources/lang/fr_FR/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Date de paiement', 'invoice_date' => 'Date de facturation', 'internal_reference' => 'Référence interne', -]; +]; \ No newline at end of file From f0931b8438e1d60df9ccd1eed24d68080e114b14 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:33 +0100 Subject: [PATCH 250/276] New translations --- resources/lang/fr_FR/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/help.php b/resources/lang/fr_FR/help.php index 466fe59547..42bdf91724 100644 --- a/resources/lang/fr_FR/help.php +++ b/resources/lang/fr_FR/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => 'N\'oubliez pas que chaque page a un petit point d\'interrogation en haut à droite. Cliquez dessus pour obtenir de l\'aide concernant la page actuelle.', 'index' => 'index', 'home' => 'accueil', -]; +]; \ No newline at end of file From f2d794e372a0145cac596308c7e6ad00c504a7e3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:34 +0100 Subject: [PATCH 251/276] New translations --- resources/lang/fr_FR/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/validation.php b/resources/lang/fr_FR/validation.php index f34faf28ea..aab122ceaa 100644 --- a/resources/lang/fr_FR/validation.php +++ b/resources/lang/fr_FR/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => 'The :attribute field does not exist in :other.', 'present' => 'The :attribute field must be present.', 'amount_zero' => 'The total amount cannot be zero', -]; +]; \ No newline at end of file From 561a5bf69909c2a5e5f1b4402f17d627e93fa61f Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:35 +0100 Subject: [PATCH 252/276] New translations --- resources/lang/fr_FR/demo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/demo.php b/resources/lang/fr_FR/demo.php index 3efa9c60a3..e7f8ea934d 100644 --- a/resources/lang/fr_FR/demo.php +++ b/resources/lang/fr_FR/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Of course, any CSV file can be imported into Firefly III ', 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.', 'import-configure-configuration' => 'The configuration you see below is correct for the local file.', -]; +]; \ No newline at end of file From dd13285f04533883d8da3939098ab48a123b76f7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:37 +0100 Subject: [PATCH 253/276] Translated --- resources/lang/fr_FR/passwords.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/passwords.php b/resources/lang/fr_FR/passwords.php index b9b998ec31..56d5c341d7 100644 --- a/resources/lang/fr_FR/passwords.php +++ b/resources/lang/fr_FR/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => 'Nous vous avons envoyé par e-mail un lien de réinitialisation de votre mot de passe !', 'reset' => 'Votre mot de passe a été réinitialisé !', 'blocked' => 'Bien essayé cependant.', -]; +]; \ No newline at end of file From 5e2bdb635698acaa59a37badc18b3d6361f1f910 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:38 +0100 Subject: [PATCH 254/276] Translated --- resources/lang/fr_FR/pagination.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/pagination.php b/resources/lang/fr_FR/pagination.php index 8adc2767a1..f073608f48 100644 --- a/resources/lang/fr_FR/pagination.php +++ b/resources/lang/fr_FR/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« Précédent', 'next' => 'Suivant »', -]; +]; \ No newline at end of file From 70c99f18e16f2f91a0f9904f1a09e8fdcd06cee6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:39 +0100 Subject: [PATCH 255/276] New translations --- resources/lang/fr_FR/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/list.php b/resources/lang/fr_FR/list.php index 663fecee44..55aba8cc1d 100644 --- a/resources/lang/fr_FR/list.php +++ b/resources/lang/fr_FR/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Number of budgets', 'rule_and_groups_count' => 'Number of rules and rule groups', 'tags_count' => 'Number of tags', -]; +]; \ No newline at end of file From 96c704760c61eef2bc671d46c10c4e5a2035fafc Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:40 +0100 Subject: [PATCH 256/276] Approved. Step name: Proofread --- resources/lang/nl_NL/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/nl_NL/validation.php b/resources/lang/nl_NL/validation.php index 4cc89b2fb5..7533fe6848 100644 --- a/resources/lang/nl_NL/validation.php +++ b/resources/lang/nl_NL/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => 'Het :attribute veld bestaat niet in :other.', 'present' => 'Het :attribute veld moet aanwezig zijn.', 'amount_zero' => 'Het totaalbedrag kan niet nul zijn', -]; +]; \ No newline at end of file From e8c5942e3301c8825783d625f27ae74f4f3484c4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:42 +0100 Subject: [PATCH 257/276] Approved. Step name: Proofread --- resources/lang/nl_NL/passwords.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/nl_NL/passwords.php b/resources/lang/nl_NL/passwords.php index 0e6bcd3176..3839a12e68 100644 --- a/resources/lang/nl_NL/passwords.php +++ b/resources/lang/nl_NL/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => 'Je krijgt een mailtje met een linkje om je wachtwoord te herstellen!', 'reset' => 'Je wachtwoord is hersteld!', 'blocked' => 'Leuk geprobeerd wel.', -]; +]; \ No newline at end of file From 3ed314dbc67f1cfacc91edb01624586388d9f776 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:43 +0100 Subject: [PATCH 258/276] New translations --- resources/lang/hr_HR/demo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/hr_HR/demo.php b/resources/lang/hr_HR/demo.php index 3efa9c60a3..e7f8ea934d 100644 --- a/resources/lang/hr_HR/demo.php +++ b/resources/lang/hr_HR/demo.php @@ -21,4 +21,4 @@ return [ 'import-index' => 'Of course, any CSV file can be imported into Firefly III ', 'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.', 'import-configure-configuration' => 'The configuration you see below is correct for the local file.', -]; +]; \ No newline at end of file From d16bb7f394e7d6012ab4f49171d9ea21fed1a1dd Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:44 +0100 Subject: [PATCH 259/276] Approved. Step name: Proofread --- resources/lang/nl_NL/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/nl_NL/auth.php b/resources/lang/nl_NL/auth.php index ea6e4eba7f..f046afaa6e 100644 --- a/resources/lang/nl_NL/auth.php +++ b/resources/lang/nl_NL/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => 'Deze gegevens zijn niet correct.', 'throttle' => 'Te veel inlogpogingen. Probeer opnieuw in: seconden seconden.', -]; +]; \ No newline at end of file From c7043478f657e8e926305ab43f2f4ac99bf9ecc2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:45 +0100 Subject: [PATCH 260/276] New translations --- resources/lang/hr_HR/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/hr_HR/validation.php b/resources/lang/hr_HR/validation.php index ea21edefe4..addd0e6f39 100644 --- a/resources/lang/hr_HR/validation.php +++ b/resources/lang/hr_HR/validation.php @@ -88,4 +88,4 @@ return [ 'in_array' => 'The :attribute field does not exist in :other.', 'present' => 'The :attribute field must be present.', 'amount_zero' => 'The total amount cannot be zero', -]; +]; \ No newline at end of file From f145aaded9b2cc6490060a315780d6fae5807b2e Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:46 +0100 Subject: [PATCH 261/276] New translations --- resources/lang/hr_HR/passwords.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/hr_HR/passwords.php b/resources/lang/hr_HR/passwords.php index 93f1918c4e..80362c2eca 100644 --- a/resources/lang/hr_HR/passwords.php +++ b/resources/lang/hr_HR/passwords.php @@ -16,4 +16,4 @@ return [ 'sent' => 'Na e-mail smo ti poslali poveznicu za promjenu lozinke!', 'reset' => 'Tvoja lozinka je promijenjena!', 'blocked' => 'Lijep pokušaj.', -]; +]; \ No newline at end of file From d208fd17723f7b9c707ebf27c8d423345d46ae8f Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:48 +0100 Subject: [PATCH 262/276] New translations --- resources/lang/hr_HR/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/hr_HR/list.php b/resources/lang/hr_HR/list.php index 91254e401d..90625d54e6 100644 --- a/resources/lang/hr_HR/list.php +++ b/resources/lang/hr_HR/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Number of budgets', 'rule_and_groups_count' => 'Number of rules and rule groups', 'tags_count' => 'Number of tags', -]; +]; \ No newline at end of file From 824c317f748d3a019d333fc3765935309abfddfc Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:49 +0100 Subject: [PATCH 263/276] Translated --- resources/lang/hr_HR/pagination.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/hr_HR/pagination.php b/resources/lang/hr_HR/pagination.php index 0d6df7e178..0efae8cb62 100644 --- a/resources/lang/hr_HR/pagination.php +++ b/resources/lang/hr_HR/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« Prethodna', 'next' => 'Sljedeća »', -]; +]; \ No newline at end of file From 2c5acb8ecd6c31b82e8f73b0ee754bc59bb258b7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:50 +0100 Subject: [PATCH 264/276] Approved. Step name: Proofread --- resources/lang/nl_NL/breadcrumbs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/nl_NL/breadcrumbs.php b/resources/lang/nl_NL/breadcrumbs.php index b163e9ed68..915aae7995 100644 --- a/resources/lang/nl_NL/breadcrumbs.php +++ b/resources/lang/nl_NL/breadcrumbs.php @@ -38,4 +38,4 @@ return [ 'createTag' => 'Maak nieuwe tag', 'edit_tag' => 'Wijzig tag ":tag"', 'delete_tag' => 'Verwijder tag ":tag"', -]; +]; \ No newline at end of file From d7531cf4ffaed6bbfeb9176743c86d46229c6eaf Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:51 +0100 Subject: [PATCH 265/276] Approved. Step name: Proofread --- resources/lang/nl_NL/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/nl_NL/config.php b/resources/lang/nl_NL/config.php index 3abd349770..608b288833 100644 --- a/resources/lang/nl_NL/config.php +++ b/resources/lang/nl_NL/config.php @@ -20,4 +20,4 @@ return [ 'year' => '%Y', 'half_year' => '%B %Y', -]; +]; \ No newline at end of file From 89638a0094ad2843cb73352f54348403eb5122b1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:52 +0100 Subject: [PATCH 266/276] Approved. Step name: Proofread --- resources/lang/nl_NL/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/nl_NL/list.php b/resources/lang/nl_NL/list.php index 2eeeb69f34..95efafc5d6 100644 --- a/resources/lang/nl_NL/list.php +++ b/resources/lang/nl_NL/list.php @@ -86,4 +86,4 @@ return [ 'budget_count' => 'Aantal budgetten', 'rule_and_groups_count' => 'Aantal regels en regelgroepen', 'tags_count' => 'Aantal tags', -]; +]; \ No newline at end of file From 0cf4f44e9519e3fbcdc70b432e798c874669c506 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:54 +0100 Subject: [PATCH 267/276] Approved. Step name: Proofread --- resources/lang/nl_NL/pagination.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/nl_NL/pagination.php b/resources/lang/nl_NL/pagination.php index df407a1708..02de2ab65b 100644 --- a/resources/lang/nl_NL/pagination.php +++ b/resources/lang/nl_NL/pagination.php @@ -14,4 +14,4 @@ return [ 'previous' => '« Vorige', 'next' => 'Volgende »', -]; +]; \ No newline at end of file From 9c10e3970dd2d7cca2657b8c2971a93eb7933891 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:55 +0100 Subject: [PATCH 268/276] Approved. Step name: Proofread --- resources/lang/nl_NL/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/nl_NL/help.php b/resources/lang/nl_NL/help.php index 2b4b79b2f9..9ca29221ad 100644 --- a/resources/lang/nl_NL/help.php +++ b/resources/lang/nl_NL/help.php @@ -30,4 +30,4 @@ return [ 'main-content-end-text' => 'Elke pagina heeft een vraagtekentje rechtsboven. Gebruik deze voor meer hulp. Veel plezier!', 'index' => 'index', 'home' => 'home', -]; +]; \ No newline at end of file From 2ed095d58f77b2c796fe58e33d6a84c94b64628c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:56 +0100 Subject: [PATCH 269/276] Approved. Step name: Proofread --- resources/lang/nl_NL/form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php index 2e075be59a..c3a5997cea 100644 --- a/resources/lang/nl_NL/form.php +++ b/resources/lang/nl_NL/form.php @@ -181,4 +181,4 @@ return [ 'payment_date' => 'Betalingsdatum', 'invoice_date' => 'Factuurdatum', 'internal_reference' => 'Interne verwijzing', -]; +]; \ No newline at end of file From 94631ca8d753d8d05641ef1a41901239315a65b5 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:58 +0100 Subject: [PATCH 270/276] Approved. Step name: Proofread --- resources/lang/nl_NL/csv.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/nl_NL/csv.php b/resources/lang/nl_NL/csv.php index a50e4dd193..876ca796a4 100644 --- a/resources/lang/nl_NL/csv.php +++ b/resources/lang/nl_NL/csv.php @@ -77,4 +77,4 @@ return [ 'column_tags-space' => 'Tags (spatiegescheiden)', 'column_account-number' => 'Betaalrekening (rekeningnummer)', 'column_opposing-number' => 'Tegenrekening (rekeningnummer)', -]; +]; \ No newline at end of file From 364eb2838ecf96a64f524c60fea64d9c971e999c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:12:59 +0100 Subject: [PATCH 271/276] Translated --- resources/lang/zh_TW/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_TW/auth.php b/resources/lang/zh_TW/auth.php index 8278daa0a3..7a20761eea 100644 --- a/resources/lang/zh_TW/auth.php +++ b/resources/lang/zh_TW/auth.php @@ -25,4 +25,4 @@ return [ 'failed' => '帳號或密碼錯誤。', 'throttle' => '登入失敗次數過多，請等待 :seconds 秒後再試。', -]; +]; \ No newline at end of file From b13a87892762fcb039b279761eb115f54f4b7f12 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:17:07 +0100 Subject: [PATCH 272/276] Slightly expanded modifiers [skip ci] --- app/Support/Search/Modifier.php | 3 +++ config/firefly.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Support/Search/Modifier.php b/app/Support/Search/Modifier.php index 3f1e514686..d61b64f020 100644 --- a/app/Support/Search/Modifier.php +++ b/app/Support/Search/Modifier.php @@ -85,14 +85,17 @@ class Modifier Log::debug(sprintf('Transaction type is %s? %s', $modifier['value'], var_export($res, true))); break; case 'date': + case 'on': $res = Modifier::sameDate($transaction->date, $modifier['value']); Log::debug(sprintf('Date is %s? %s', $modifier['value'], var_export($res, true))); break; case 'date_before': + case 'before': $res = Modifier::dateBefore($transaction->date, $modifier['value']); Log::debug(sprintf('Date is %s? %s', $modifier['value'], var_export($res, true))); break; case 'date_after': + case 'after': $res = Modifier::dateAfter($transaction->date, $modifier['value']); Log::debug(sprintf('Date is %s? %s', $modifier['value'], var_export($res, true))); break; diff --git a/config/firefly.php b/config/firefly.php index 0172e2d6ea..a0c66d2b4a 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -210,6 +210,6 @@ return [ 'default_currency' => 'EUR', 'default_language' => 'en_US', 'search_modifiers' => ['amount_is', 'amount', 'amount_max', 'amount_min', 'amount_less', 'amount_more', 'source', 'destination', 'category', - 'budget', 'bill', 'type', 'date', 'date_before', 'date_after'], + 'budget', 'bill', 'type', 'date', 'date_before', 'date_after','on','before','after'], // tag notes has_attachments ]; From 283ee076c7b58f012ba096869e0d711fcc654321 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:19:30 +0100 Subject: [PATCH 273/276] Expand view [skip ci] --- resources/views/search/index.twig | 2 +- .../search/partials/transactions-large.twig | 139 ++++++++++++++++++ 2 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 resources/views/search/partials/transactions-large.twig diff --git a/resources/views/search/index.twig b/resources/views/search/index.twig index 5459b7720f..5bfb623b9a 100644 --- a/resources/views/search/index.twig +++ b/resources/views/search/index.twig @@ -54,7 +54,7 @@

                                                                                                                                                                                                        {{ trans('firefly.search_found_transactions', {count: result.transactions|length}) }}

                                                                                                                                                                                                        - {% include 'search.partials.transactions' with {'transactions' : result.transactions} %} + {% include 'search.partials.transactions-large' with {'journals' : result.transactions} %}
                                                                                                                                                                                                        diff --git a/resources/views/search/partials/transactions-large.twig b/resources/views/search/partials/transactions-large.twig new file mode 100644 index 0000000000..7502719e27 --- /dev/null +++ b/resources/views/search/partials/transactions-large.twig @@ -0,0 +1,139 @@ +{{ journals.render|raw }} + + + + + + + + + + + + + {% if not hideBudgets %} + + {% endif %} + + + {% if not hideCategories %} + + {% endif %} + + + {% if not hideBills %} + + {% endif %} + + + + {% for transaction in journals %} + + + + + + + + + + + + {% if not hideBudgets %} + + {% endif %} + + + {% if not hideCategories %} + + {% endif %} + + + {% if not hideBills %} + + {% endif %} + + {% endfor %} + +
                                                                                                                                                                                                        {{ trans('list.description') }}{{ trans('list.amount') }}
                                                                                                                                                                                                        + + + {% if transaction.transaction_description|length > 0 %} + {{ transaction.transaction_description }} ({{ transaction.description }}) + {% else %} + {{ transaction.description }} + {% endif %} + + {{ splitJournalIndicator(transaction.journal_id) }} + + {% if transaction.transactionJournal.attachments|length > 0 %} + + {% endif %} + + + + {% if transaction.transaction_type_type == 'Transfer' %} + + {{ formatByCode(transaction.transaction_currency_code, steam_positive(transaction.transaction_amount)) }} + + {{ optionalJournalAmount(transaction.journal_id, transaction.transaction_amount, transaction.transaction_currency_code, transaction.transaction_type_type) }} + {% else %} + + {{ formatByCode(transaction.transaction_currency_code, transaction.transaction_amount) }} + + {{ optionalJournalAmount(transaction.journal_id, transaction.transaction_amount, transaction.transaction_currency_code, transaction.transaction_type_type) }} + {% endif %} + + +
                                                                                                                                                                                                        + +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        + {{ journals.render|raw }} +
                                                                                                                                                                                                        +
                                                                                                                                                                                                        + From 1f37ea3d3c5196f11dc226a0c934ba90c10f1987 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 12:30:11 +0100 Subject: [PATCH 274/276] Translated --- resources/lang/nl_NL/firefly.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 3912856722..f27beb8fec 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -26,8 +26,8 @@ return [ 'showEverything' => 'Laat alles zien', 'never' => 'Nooit', 'search_results_for' => 'Zoekresultaten voor ":query"', - 'advanced_search' => 'Advanced search', - 'advanced_search_intro' => 'There are several modifiers that you can use in your search to narrow down the results. If you use any of these, the search will only return transactions. Please click the -icon for more information.', + 'advanced_search' => 'Geavanceerd zoeken', + 'advanced_search_intro' => 'Er zijn een paar parameters die je in je zoekopdracht kan gebruiken om betere resultaten te krijgen. Ze werken alleen op transacties. Klik op het -icoontje om hier meer over te lezen.', 'bounced_error' => 'Het emailtje naar :email kwam nooit aan.', 'deleted_error' => 'Deze gegevens zijn niet correct.', 'general_blocked_error' => 'Je account is uitgeschakeld, je kan helaas niet inloggen.', From 5b267c0e954f6ba9aecb647c68af9ad960ca2011 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 16:36:03 +0100 Subject: [PATCH 275/276] Update to version 4.3.5 --- CHANGELOG.md | 1 + config/firefly.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73c018a7db..e926fc7b54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Added - Beta support for Sandstorm.IO - Docker support by [@schoentoon](https://github.com/schoentoon), [@elohmeier](https://github.com/elohmeier), [@patrickkostjens](https://github.com/patrickkostjens) and [@crash7](https://github.com/crash7)! +- Can now use special keywords in the search to search for specic dates, categories, etc. ### Changed - Updated to laravel 5.4! diff --git a/config/firefly.php b/config/firefly.php index a0c66d2b4a..7e28edf8dd 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -24,7 +24,7 @@ return [ ], 'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true), 'chart' => 'chartjs', - 'version' => '4.3.4', + 'version' => '4.3.5', 'csv_import_enabled' => true, 'maxUploadSize' => 5242880, 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'], From cf1813b4134014a743797b247316295aa59239df Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2017 16:48:49 +0100 Subject: [PATCH 276/276] Updated composer.lock --- composer.lock | 110 +++++++++++++++++++++++++------------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/composer.lock b/composer.lock index d7fca941ad..c67ced8a26 100644 --- a/composer.lock +++ b/composer.lock @@ -1637,16 +1637,16 @@ }, { "name": "symfony/console", - "version": "v3.2.3", + "version": "v3.2.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "7a8405a9fc175f87fed8a3c40856b0d866d61936" + "reference": "0e5e6899f82230fcb1153bcaf0e106ffaa44b870" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/7a8405a9fc175f87fed8a3c40856b0d866d61936", - "reference": "7a8405a9fc175f87fed8a3c40856b0d866d61936", + "url": "https://api.github.com/repos/symfony/console/zipball/0e5e6899f82230fcb1153bcaf0e106ffaa44b870", + "reference": "0e5e6899f82230fcb1153bcaf0e106ffaa44b870", "shasum": "" }, "require": { @@ -1696,7 +1696,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-02-06T12:04:21+00:00" + "time": "2017-02-16T14:07:22+00:00" }, { "name": "symfony/css-selector", @@ -1753,16 +1753,16 @@ }, { "name": "symfony/debug", - "version": "v3.2.3", + "version": "v3.2.4", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "b4d9818f127c60ce21ed62c395da7df868dc8477" + "reference": "9b98854cb45bc59d100b7d4cc4cf9e05f21026b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/b4d9818f127c60ce21ed62c395da7df868dc8477", - "reference": "b4d9818f127c60ce21ed62c395da7df868dc8477", + "url": "https://api.github.com/repos/symfony/debug/zipball/9b98854cb45bc59d100b7d4cc4cf9e05f21026b9", + "reference": "9b98854cb45bc59d100b7d4cc4cf9e05f21026b9", "shasum": "" }, "require": { @@ -1806,11 +1806,11 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-01-28T02:37:08+00:00" + "time": "2017-02-16T16:34:18+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.2.3", + "version": "v3.2.4", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -1870,7 +1870,7 @@ }, { "name": "symfony/finder", - "version": "v3.2.3", + "version": "v3.2.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -1919,16 +1919,16 @@ }, { "name": "symfony/http-foundation", - "version": "v3.2.3", + "version": "v3.2.4", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "e192b04de44aa1ed0e39d6793f7e06f5e0b672a0" + "reference": "a90da6dd679605d88c9803a57a6fc1fb7a19a6e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e192b04de44aa1ed0e39d6793f7e06f5e0b672a0", - "reference": "e192b04de44aa1ed0e39d6793f7e06f5e0b672a0", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a90da6dd679605d88c9803a57a6fc1fb7a19a6e0", + "reference": "a90da6dd679605d88c9803a57a6fc1fb7a19a6e0", "shasum": "" }, "require": { @@ -1968,20 +1968,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2017-02-02T13:47:35+00:00" + "time": "2017-02-16T22:46:52+00:00" }, { "name": "symfony/http-kernel", - "version": "v3.2.3", + "version": "v3.2.4", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "96443239baf674b143604fb87cb27cb01672ab77" + "reference": "4cd0d4bc31819095c6ef13573069f621eb321081" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/96443239baf674b143604fb87cb27cb01672ab77", - "reference": "96443239baf674b143604fb87cb27cb01672ab77", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4cd0d4bc31819095c6ef13573069f621eb321081", + "reference": "4cd0d4bc31819095c6ef13573069f621eb321081", "shasum": "" }, "require": { @@ -2050,7 +2050,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2017-02-06T13:15:19+00:00" + "time": "2017-02-16T23:59:56+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -2221,16 +2221,16 @@ }, { "name": "symfony/process", - "version": "v3.2.3", + "version": "v3.2.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "32646a7cf53f3956c76dcb5c82555224ae321858" + "reference": "0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/32646a7cf53f3956c76dcb5c82555224ae321858", - "reference": "32646a7cf53f3956c76dcb5c82555224ae321858", + "url": "https://api.github.com/repos/symfony/process/zipball/0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856", + "reference": "0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856", "shasum": "" }, "require": { @@ -2266,11 +2266,11 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-02-03T12:11:38+00:00" + "time": "2017-02-16T14:07:22+00:00" }, { "name": "symfony/routing", - "version": "v3.2.3", + "version": "v3.2.4", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", @@ -2345,16 +2345,16 @@ }, { "name": "symfony/translation", - "version": "v3.2.3", + "version": "v3.2.4", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "ca032cc56976d88b85e7386b17020bc6dc95dbc5" + "reference": "d6825c6bb2f1da13f564678f9f236fe8242c0029" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/ca032cc56976d88b85e7386b17020bc6dc95dbc5", - "reference": "ca032cc56976d88b85e7386b17020bc6dc95dbc5", + "url": "https://api.github.com/repos/symfony/translation/zipball/d6825c6bb2f1da13f564678f9f236fe8242c0029", + "reference": "d6825c6bb2f1da13f564678f9f236fe8242c0029", "shasum": "" }, "require": { @@ -2405,20 +2405,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2017-01-21T17:06:35+00:00" + "time": "2017-02-16T22:46:52+00:00" }, { "name": "symfony/var-dumper", - "version": "v3.2.3", + "version": "v3.2.4", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "5bb4435a03a4f05c211f4a9a8ee2756965924511" + "reference": "cb50260b674ee1c2d4ab49f2395a42e0b4681e20" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/5bb4435a03a4f05c211f4a9a8ee2756965924511", - "reference": "5bb4435a03a4f05c211f4a9a8ee2756965924511", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/cb50260b674ee1c2d4ab49f2395a42e0b4681e20", + "reference": "cb50260b674ee1c2d4ab49f2395a42e0b4681e20", "shasum": "" }, "require": { @@ -2468,7 +2468,7 @@ "debug", "dump" ], - "time": "2017-01-24T12:58:58+00:00" + "time": "2017-02-16T22:46:52+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -3619,16 +3619,16 @@ }, { "name": "phpunit/phpunit", - "version": "5.7.13", + "version": "5.7.14", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "60ebeed87a35ea46fd7f7d8029df2d6f013ebb34" + "reference": "4906b8faf23e42612182fd212eb6f4c0f2954b57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/60ebeed87a35ea46fd7f7d8029df2d6f013ebb34", - "reference": "60ebeed87a35ea46fd7f7d8029df2d6f013ebb34", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4906b8faf23e42612182fd212eb6f4c0f2954b57", + "reference": "4906b8faf23e42612182fd212eb6f4c0f2954b57", "shasum": "" }, "require": { @@ -3652,7 +3652,7 @@ "sebastian/global-state": "^1.1", "sebastian/object-enumerator": "~2.0", "sebastian/resource-operations": "~1.0", - "sebastian/version": "~1.0|~2.0", + "sebastian/version": "~1.0.3|~2.0", "symfony/yaml": "~2.1|~3.0" }, "conflict": { @@ -3697,7 +3697,7 @@ "testing", "xunit" ], - "time": "2017-02-10T09:05:10+00:00" + "time": "2017-02-19T07:22:16+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -4089,16 +4089,16 @@ }, { "name": "sebastian/object-enumerator", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35" + "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35", - "reference": "96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7", + "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7", "shasum": "" }, "require": { @@ -4131,7 +4131,7 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2016-11-19T07:35:10+00:00" + "time": "2017-02-18T15:18:39+00:00" }, { "name": "sebastian/recursion-context", @@ -4273,7 +4273,7 @@ }, { "name": "symfony/class-loader", - "version": "v3.2.3", + "version": "v3.2.4", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", @@ -4385,16 +4385,16 @@ }, { "name": "symfony/yaml", - "version": "v3.2.3", + "version": "v3.2.4", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "e1718c6bf57e1efbb8793ada951584b2ab27775b" + "reference": "9724c684646fcb5387d579b4bfaa63ee0b0c64c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/e1718c6bf57e1efbb8793ada951584b2ab27775b", - "reference": "e1718c6bf57e1efbb8793ada951584b2ab27775b", + "url": "https://api.github.com/repos/symfony/yaml/zipball/9724c684646fcb5387d579b4bfaa63ee0b0c64c8", + "reference": "9724c684646fcb5387d579b4bfaa63ee0b0c64c8", "shasum": "" }, "require": { @@ -4436,7 +4436,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-01-21T17:06:35+00:00" + "time": "2017-02-16T22:46:52+00:00" }, { "name": "webmozart/assert",

    • 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%0DFaj_SM^4ytur670vQ> zb%iQW;69C=E6#ZCA2mb6QhTJ;g{=4DZPm2UmBrHpS<`(Sf>Z;s_~%6LDysCnV6?B_ zUjx%rP(rfTc{5E@pu$@EFfYY(Gn^249CuO5#3vwch=fksawO{-%qM_!a)=$>oCmZS zk{!`jLJZA6k^D$EsJCAM2YUyQ9qtzz+7HV&O9QBo;2tp>17T zuVw!EcV($vp!($Mul6SO_$-7i{*?4;2!Gir09gu$y{a=B#c8RdmGB(Dhp4SDe)EHf zIVHnSxfhPxC%t}0u?9t!M%q3;*<{Us*X=QVNDkuE9~HujA}{X6fe1rMNS?26=T}yi zQqy~_^4EDee7Z<5wS6^?3+1CiPgE9bxO3o*A1cg2U8_JovT?NT*sl1`jT$Pcfa+=c z@~gFK(EsYuL78n0Q@1aAvNrwqHDF;=m(-R=v?~5LvGqIT;iFO9?{^*`$x)*Lybvk? zxDfExmi)EU{whgwnIs>K?_2(?3;uD+B9q;$^_LtU?$U177BzXn3!sPv2mh^@*94#? z=cJ?ujfQq$e|&DD%Qk>|IOUrqHZl8j)(5|L^Cif`9+nmV_0wU0;_O1sM3d$>lxrF2 zcRtEid2_tEiBt9+QS}g`OrEe&Q@6_p9_i<8V=Vt#iZu}^HDp{|MiS{gBBza}2>sqr z`!b4p9C*&_j@`|Fellk8pC_lWkmh4nJXOH;`?1iC7pOV8ToV4j7swfA?ohC1Df{2Q zkcGi&n4hZZ{-5ewSQ>n9>1ql7wch`_jq_kYYy!Tb63}({*Tn>n|KA$2e?3D}7VK={ zq}sZFyegnzp&ea5(i2&r7}`HOPora)qKGOy1V1EGL6WNIo9G8+gMV({yjZyG#wYJv z4+}Gk&$|pp%rDjOFNY}O&1@9pn!nW7VP!b+ySDJYdNVbiMGPQh(v+?Es2h)!{}GSd>pT=1QAxvX)HQ8d+T(4xoKH|;=uyK)>2w%|2c(7vf~Td zm+xq#$1L)gjZXTd&Z{TV##&+yf2fsN#$9*fK>;Lp8qEOS_Nwu;W8tl%@w9N^2P5W> zW_SmJ>AF){_yL3|_nqNGI{RbQqk;GH6%C%sJ+n0Lf^3SxuvbKiMLz@;7GnY=#UKO` zP_ik(I5G_8IRINvH1R!CpmGGnaKPE+0L!1K+i}W0GY|s-vn_!zX|S<@`Zwi}kB=|# zZAnQQh*gQDkr~dG&>#-!lu7~Rk#oIj_@7S)hu3dytMs|vr}!!_Tvvg}Z&u?@e6IZD zcfYumlnqbWuLXMJUs%`*Kh#>Y=OkZDhf}@#_LSTk}QC>%QGXTAEjxca3gLq%s7`0a9Tq%lZyeCI1>?%Y8PdQ!1b64xAC=4$$S!Lybg&|F+SmvV({y7{6lJ`NKk z&Hy{B!*#v)w5y7VoEZ1FBGl_W)FUgl9RW&?A~YTIleqY+y~*z(;mXf4>(ofO@*c#z zicYc>*2+k;7Bkw{=PozO&QiMBh(3< NlAOA1xwNtW{{!TCBdGuY literal 0 HcmV?d00001 diff --git a/.sandstorm/screenshots/screenshot-2.png b/.sandstorm/screenshots/screenshot-2.png new file mode 100644 index 0000000000000000000000000000000000000000..93018518505bfd0f6982d856b99a0bcdbf93c7e9 GIT binary patch literal 227686 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𝔥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≺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%0Aeq%=rDkFD(EBc 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 MCMQ}ctpDTx01dR6xc~qF literal 0 HcmV?d00001 diff --git a/.sandstorm/screenshots/screenshot-3.png b/.sandstorm/screenshots/screenshot-3.png new file mode 100644 index 0000000000000000000000000000000000000000..20fcab548fd2112fb01875a52d0cd67b3f622d0b GIT binary patch literal 286366 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