diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index bd83eb13b4..1a82b02e86 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -125,8 +125,10 @@ class UserController extends Controller } /** - * @param UserFormRequest $request - * @param User $user + * @param UserFormRequest $request + * @param User $user + * + * @param UserRepositoryInterface $repository * * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index 5f5f36f159..d1cfdd7832 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -41,7 +41,9 @@ class ForgotPasswordController extends Controller /** * Send a reset link to the given user. * - * @param Request $request + * @param Request $request + * + * @param UserRepositoryInterface $repository * * @return \Illuminate\Http\RedirectResponse */ diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index d2186aa40f..f74d1a1e7f 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -110,7 +110,9 @@ class LoginController extends Controller /** * Show the application login form. * - * @param Request $request + * @param Request $request + * + * @param CookieJar $cookieJar * * @return \Illuminate\Http\Response */ diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 9fd5d23a6a..42008215ea 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -191,8 +191,9 @@ class BudgetController extends Controller } /** - * @param Request $request - * @param string $moment + * @param Request $request + * @param JournalRepositoryInterface $repository + * @param string $moment * * @return View */ diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index a9b76e97b7..7975bc26a5 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -154,6 +154,10 @@ class CategoryController extends Controller } /** + * @param Request $request + * @param JournalRepositoryInterface $repository + * @param string $moment + * * @return View */ public function noCategory(Request $request, JournalRepositoryInterface $repository, string $moment = '') diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php index a1d04f01a1..325698f720 100644 --- a/app/Http/Controllers/ImportController.php +++ b/app/Http/Controllers/ImportController.php @@ -274,10 +274,10 @@ class ImportController extends Controller * Step 5. Depending on the importer, this will show the user settings to * fill in. * - * @param ImportJob $job + * @param ImportJobRepositoryInterface $repository + * @param ImportJob $job * * @return View - * @throws FireflyException */ public function settings(ImportJobRepositoryInterface $repository, ImportJob $job) { diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index b1d67fdaf9..63a6a354d2 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/app/Http/Controllers/JavascriptController.php @@ -31,7 +31,10 @@ class JavascriptController extends Controller { /** + * @param AccountRepositoryInterface $repository + * @param CurrencyRepositoryInterface $currencyRepository * + * @return $this */ public function accounts(AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository) { diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index 3960264476..0a200b4a47 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -132,7 +132,9 @@ class PreferencesController extends Controller } /** - * @param Request $request + * @param Request $request + * + * @param UserRepositoryInterface $repository * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 325eac42f2..6a6cffa7bc 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -140,7 +140,9 @@ class TagController extends Controller } /** - * @param Tag $tag + * @param Tag $tag + * + * @param TagRepositoryInterface $repository * * @return View */ diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index c8369d0a2f..5fdfa5fa40 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -60,6 +60,8 @@ class TransactionController extends Controller * @param JournalRepositoryInterface $repository * @param string $what * + * @param string $moment + * * @return View */ public function index(Request $request, JournalRepositoryInterface $repository, string $what, string $moment = '') diff --git a/config/auth.php b/config/auth.php index 55a6840414..9145ce8641 100644 --- a/config/auth.php +++ b/config/auth.php @@ -10,32 +10,32 @@ */ return [ - 'defaults' => [ - 'guard' => 'web', + 'defaults' => [ + 'guard' => 'web', 'passwords' => 'users', ], - 'guards' => [ + 'guards' => [ 'web' => [ - 'driver' => 'session', + 'driver' => 'session', 'provider' => 'users', ], 'api' => [ - 'driver' => 'token', + 'driver' => 'token', 'provider' => 'users', ], ], 'providers' => [ 'users' => [ 'driver' => 'eloquent', - 'model' => FireflyIII\User::class, + 'model' => FireflyIII\User::class, ], ], 'passwords' => [ 'users' => [ 'provider' => 'users', - 'table' => 'password_resets', - 'expire' => 120, + 'table' => 'password_resets', + 'expire' => 120, ], ], diff --git a/config/broadcasting.php b/config/broadcasting.php index 8100899690..b165564840 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -40,17 +40,17 @@ return [ 'connections' => [ 'pusher' => [ - 'driver' => 'pusher', - 'key' => env('PUSHER_KEY'), - 'secret' => env('PUSHER_SECRET'), - 'app_id' => env('PUSHER_APP_ID'), + 'driver' => 'pusher', + 'key' => env('PUSHER_KEY'), + 'secret' => env('PUSHER_SECRET'), + 'app_id' => env('PUSHER_APP_ID'), 'options' => [ // ], ], 'redis' => [ - 'driver' => 'redis', + 'driver' => 'redis', 'connection' => 'default', ], diff --git a/config/csv.php b/config/csv.php index 0cd7e1183f..5da40e41e0 100644 --- a/config/csv.php +++ b/config/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/config/firefly.php b/config/firefly.php index 81a482e8b6..83aa8d19e2 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); /* * DO NOT EDIT THIS FILE. IT IS AUTO GENERATED. @@ -18,15 +18,15 @@ declare(strict_types = 1); */ return [ - 'configuration' => [ + 'configuration' => [ 'single_user_mode' => true, 'is_demo_site' => false, ], - 'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true), - 'version' => '4.3.8', - 'maxUploadSize' => 5242880, - 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'], - 'list_length' => 10, + 'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true), + 'version' => '4.3.8', + 'maxUploadSize' => 5242880, + 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'], + 'list_length' => 10, 'export_formats' => [ 'csv' => 'FireflyIII\Export\Exporter\CsvExporter', ], @@ -205,6 +205,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','on','before','after'], + 'budget', 'bill', 'type', 'date', 'date_before', 'date_after', 'on', 'before', 'after'], // tag notes has_attachments ]; diff --git a/config/queue.php b/config/queue.php index 664188021f..c50e7c2a44 100644 --- a/config/queue.php +++ b/config/queue.php @@ -44,32 +44,32 @@ return [ ], 'database' => [ - 'driver' => 'database', - 'table' => 'jobs', - 'queue' => 'default', + 'driver' => 'database', + 'table' => 'jobs', + 'queue' => 'default', 'retry_after' => 90, ], 'beanstalkd' => [ - 'driver' => 'beanstalkd', - 'host' => 'localhost', - 'queue' => 'default', + 'driver' => 'beanstalkd', + 'host' => 'localhost', + 'queue' => 'default', 'retry_after' => 90, ], 'sqs' => [ 'driver' => 'sqs', - 'key' => 'your-public-key', + 'key' => 'your-public-key', 'secret' => 'your-secret-key', 'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id', - 'queue' => 'your-queue-name', + 'queue' => 'your-queue-name', 'region' => 'us-east-1', ], 'redis' => [ - 'driver' => 'redis', - 'connection' => 'default', - 'queue' => 'default', + 'driver' => 'redis', + 'connection' => 'default', + 'queue' => 'default', 'retry_after' => 90, ], @@ -88,7 +88,7 @@ return [ 'failed' => [ 'database' => env('DB_CONNECTION', 'mysql'), - 'table' => 'failed_jobs', + 'table' => 'failed_jobs', ], ]; diff --git a/config/services.php b/config/services.php index 5990b52c66..1176da0214 100644 --- a/config/services.php +++ b/config/services.php @@ -29,7 +29,7 @@ return [ ], 'ses' => [ - 'key' => env('SES_KEY'), + 'key' => env('SES_KEY'), 'secret' => env('SES_SECRET'), 'region' => 'us-east-1', ], @@ -39,8 +39,8 @@ return [ ], 'stripe' => [ - 'model' => FireflyIII\User::class, - 'key' => env('STRIPE_KEY'), + 'model' => FireflyIII\User::class, + 'key' => env('STRIPE_KEY'), 'secret' => env('STRIPE_SECRET'), ], diff --git a/config/session.php b/config/session.php index f5af7f0fdc..4a635d2321 100644 --- a/config/session.php +++ b/config/session.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/config/upgrade.php b/config/upgrade.php index 199596e690..58c0ad66bd 100644 --- a/config/upgrade.php +++ b/config/upgrade.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ 'text' => [ diff --git a/config/view.php b/config/view.php index 9d4930f213..bb60cc6e7e 100644 --- a/config/view.php +++ b/config/view.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/public/css/firefly.css b/public/css/firefly.css index cc051e6442..80eea37df7 100644 --- a/public/css/firefly.css +++ b/public/css/firefly.css @@ -25,11 +25,6 @@ body.waiting * { cursor: progress; } -.ui-sortable-placeholder { - display: inline-block; - height: 1px; -} - .preferences-box { border: 1px #ddd solid; border-radius: 4px 4px 0 0; @@ -48,12 +43,6 @@ body.waiting * { margin: 20px auto 0 auto; } -.ff-error-page > .headline { - float: left; - font-size: 100px; - font-weight: 300; -} - .ff-error-page > .error-content { margin-left: 190px; display: block; diff --git a/public/js/ff/budgets/show.js b/public/js/ff/budgets/show.js index 5831c82031..d8f1cbb551 100644 --- a/public/js/ff/budgets/show.js +++ b/public/js/ff/budgets/show.js @@ -15,7 +15,7 @@ $(function () { if (budgetLimitID > 0) { lineChart(budgetChartUri, 'budgetOverview'); } - if (budgetLimitID == 0) { + if (budgetLimitID === 0) { columnChart(budgetChartUri, 'budgetOverview'); } diff --git a/public/js/ff/categories/show-by-date.js b/public/js/ff/categories/show-by-date.js index e97dab4db8..f3bdde08a3 100644 --- a/public/js/ff/categories/show-by-date.js +++ b/public/js/ff/categories/show-by-date.js @@ -12,5 +12,5 @@ $(function () { "use strict"; - columnChart(specific, 'period-specific-period'); + columnChart(specific, 'period-specific-period'); }); \ No newline at end of file diff --git a/public/js/ff/import/status.js b/public/js/ff/import/status.js index cf97ab9935..cc1ec69a9e 100644 --- a/public/js/ff/import/status.js +++ b/public/js/ff/import/status.js @@ -62,7 +62,7 @@ function updateBar(data) { function reportErrors(data) { "use strict"; - if (data.errors.length == 1) { + if (data.errors.length === 1) { $('#import-status-error-intro').text(langImportSingleError); //'An error has occured during the import. The import can continue, however.' } @@ -93,7 +93,7 @@ function kickStartJob() { function updateTimeout(data) { "use strict"; - if (data.stepsDone != stepCount) { + if (data.stepsDone !== stepCount) { stepCount = data.stepsDone; currentLimit = 0; return; diff --git a/public/js/ff/index.js b/public/js/ff/index.js index 1cd119c383..242768712d 100644 --- a/public/js/ff/index.js +++ b/public/js/ff/index.js @@ -14,7 +14,7 @@ $(function () { "use strict"; // do chart JS stuff. drawChart(); - if (showTour == true) { + if (showTour === true) { $.getJSON('json/tour').done(function (data) { var tour = new Tour( { diff --git a/public/js/ff/reports/default/all.js b/public/js/ff/reports/default/all.js index 1f838a0ebc..6fc394d7dd 100644 --- a/public/js/ff/reports/default/all.js +++ b/public/js/ff/reports/default/all.js @@ -99,9 +99,9 @@ function displayAjaxPartial(data, holder) { function failAjaxPartial(uri, holder) { "use strict"; - var holder = $('#' + holder); - holder.parent().find('.overlay').remove(); - holder.addClass('general-chart-error'); + var holderObject = $('#' + holder); + holderObject.parent().find('.overlay').remove(); + holderObject.addClass('general-chart-error'); } diff --git a/public/js/ff/reports/default/month.js b/public/js/ff/reports/default/month.js index 1c2f08be63..fb35e4f8ba 100644 --- a/public/js/ff/reports/default/month.js +++ b/public/js/ff/reports/default/month.js @@ -16,7 +16,7 @@ $(function () { loadAjaxPartial('categoryReport', categoryReportUri); loadAjaxPartial('budgetReport', budgetReportUri); - loadAjaxPartial('balanceReport',balanceReportUri); + loadAjaxPartial('balanceReport', balanceReportUri); }); function drawChart() { diff --git a/public/js/ff/reports/index.js b/public/js/ff/reports/index.js index 2891c12fd1..02994f209f 100644 --- a/public/js/ff/reports/index.js +++ b/public/js/ff/reports/index.js @@ -56,7 +56,7 @@ $(function () { // set date from cookie var startStr = readCookie('report-start'); var endStr = readCookie('report-end'); - if (startStr !== null && endStr !== null && startStr.length == 8 && endStr.length == 8) { + if (startStr !== null && endStr !== null && startStr.length === 8 && endStr.length === 8) { var startDate = moment(startStr, "YYYY-MM-DD"); var endDate = moment(endStr, "YYYY-MM-DD"); var datePicker = $('#inputDateRange').data('daterangepicker'); diff --git a/public/js/ff/rules/create-edit.js b/public/js/ff/rules/create-edit.js index 1652ae804b..3b8e871e04 100644 --- a/public/js/ff/rules/create-edit.js +++ b/public/js/ff/rules/create-edit.js @@ -104,14 +104,14 @@ function addNewAction() { function removeTrigger(e) { "use strict"; var target = $(e.target); - if (target.prop("tagName") == "I") { + if (target.prop("tagName") === "I") { target = target.parent(); } // remove grand parent: target.parent().parent().remove(); // if now at zero, immediatly add one again: - if ($('.rule-trigger-tbody tr').length == 0) { + if ($('.rule-trigger-tbody tr').length === 0) { addNewTrigger(); } return false; @@ -125,14 +125,14 @@ function removeTrigger(e) { function removeAction(e) { "use strict"; var target = $(e.target); - if (target.prop("tagName") == "I") { + if (target.prop("tagName") === "I") { target = target.parent(); } // remove grand parent: target.parent().parent().remove(); // if now at zero, immediatly add one again: - if ($('.rule-action-tbody tr').length == 0) { + if ($('.rule-action-tbody tr').length === 0) { addNewAction(); } return false; diff --git a/public/js/ff/tags/create-edit.js b/public/js/ff/tags/create-edit.js index 7184b17ae2..369d1134ef 100644 --- a/public/js/ff/tags/create-edit.js +++ b/public/js/ff/tags/create-edit.js @@ -51,28 +51,28 @@ function clearLocation() { function initialize() { "use strict"; /* - Create new map: + Create new map: */ map = new google.maps.Map(document.getElementById('map-canvas'), mapOptions); /* - Respond to click event. + Respond to click event. */ google.maps.event.addListener(map, 'rightclick', function (event) { placeMarker(event); }); /* - Respond to zoom event. + Respond to zoom event. */ google.maps.event.addListener(map, 'zoom_changed', function () { saveZoomLevel(); }); /* - Maybe place marker? + Maybe place marker? */ - if(doPlaceMarker == true) { - var myLatlng = new google.maps.LatLng(latitude,longitude); + if (doPlaceMarker === true) { + var myLatlng = new google.maps.LatLng(latitude, longitude); var fakeEvent = {}; fakeEvent.latLng = myLatlng; placeMarker(fakeEvent); diff --git a/public/js/ff/transactions/list.js b/public/js/ff/transactions/list.js index 74dc53f24d..39cc72fc9a 100644 --- a/public/js/ff/transactions/list.js +++ b/public/js/ff/transactions/list.js @@ -72,8 +72,8 @@ function countChecked() { "use strict"; var checked = $('.select_all_single:checked').length; if (checked > 0) { - $('.mass_edit span').text(edit_selected_txt + ' (' + checked + ')') - $('.mass_delete span').text(delete_selected_txt + ' (' + checked + ')') + $('.mass_edit span').text(edit_selected_txt + ' (' + checked + ')'); + $('.mass_delete span').text(delete_selected_txt + ' (' + checked + ')'); $('.mass_button_options').show(); } else { diff --git a/public/js/ff/transactions/single/create.js b/public/js/ff/transactions/single/create.js index 203962b24c..5c10be71d3 100644 --- a/public/js/ff/transactions/single/create.js +++ b/public/js/ff/transactions/single/create.js @@ -26,7 +26,7 @@ $(document).ready(function () { } // update currency - $('select[name="source_account_id"]').on('change', updateCurrency) + $('select[name="source_account_id"]').on('change', updateCurrency); // get JSON things: getJSONautocomplete(); @@ -178,7 +178,7 @@ function updateButtons() { // new click event: button.bind('click', clickButton); - if (button.data('what') == what) { + if (button.data('what') === what) { button.removeClass('btn-default').addClass('btn-info').html(' ' + txt[button.data('what')]); } else { button.removeClass('btn-info').addClass('btn-default').text(txt[button.data('what')]); @@ -190,7 +190,7 @@ function clickButton(e) { "use strict"; var button = $(e.target); var newWhat = button.data('what'); - if (newWhat != what) { + if (newWhat !== what) { what = newWhat; updateButtons(); updateForm(); diff --git a/public/js/ff/transactions/split/edit.js b/public/js/ff/transactions/split/edit.js index 19fffbdf4b..a91c0a3422 100644 --- a/public/js/ff/transactions/split/edit.js +++ b/public/js/ff/transactions/split/edit.js @@ -184,12 +184,12 @@ function calculateSum() { var set = $('input[name$="][amount]"]'); for (var i = 0; i < set.length; i++) { var current = $(set[i]); - sum += (current.val() == "" ? 0 : parseFloat(current.val())); + sum += (current.val() === "" ? 0 : parseFloat(current.val())); } sum = Math.round(sum * 100) / 100; $('.amount-warning').remove(); - if (sum != originalSum) { + if (sum !== originalSum) { var holder = $('#journal_amount_holder'); var par = holder.find('p.form-control-static'); $('').text(' (' + accounting.formatMoney(sum) + ')').addClass('text-danger amount-warning').appendTo(par); diff --git a/resources/lang/de_DE/csv.php b/resources/lang/de_DE/csv.php index fca9ee7d0f..71a33e1fc8 100644 --- a/resources/lang/de_DE/csv.php +++ b/resources/lang/de_DE/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/en_US/csv.php b/resources/lang/en_US/csv.php index 6b5abd3431..d5306e2a88 100644 --- a/resources/lang/en_US/csv.php +++ b/resources/lang/en_US/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/es_ES/csv.php b/resources/lang/es_ES/csv.php index 4acb52efdc..4424610191 100644 --- a/resources/lang/es_ES/csv.php +++ b/resources/lang/es_ES/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php index b5bbae3400..4c2cd1a072 100644 --- a/resources/lang/fr_FR/csv.php +++ b/resources/lang/fr_FR/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/hr_HR/csv.php b/resources/lang/hr_HR/csv.php index 4acb52efdc..4424610191 100644 --- a/resources/lang/hr_HR/csv.php +++ b/resources/lang/hr_HR/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/nl_NL/csv.php b/resources/lang/nl_NL/csv.php index 876ca796a4..5de8d082fd 100644 --- a/resources/lang/nl_NL/csv.php +++ b/resources/lang/nl_NL/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/pl_PL/csv.php b/resources/lang/pl_PL/csv.php index d9b1b88c79..72961b5ab5 100644 --- a/resources/lang/pl_PL/csv.php +++ b/resources/lang/pl_PL/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/pt_BR/csv.php b/resources/lang/pt_BR/csv.php index a1b92485f2..06ed873ac8 100644 --- a/resources/lang/pt_BR/csv.php +++ b/resources/lang/pt_BR/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/ru_RU/csv.php b/resources/lang/ru_RU/csv.php index 37e4e88998..0bfa2c13e0 100644 --- a/resources/lang/ru_RU/csv.php +++ b/resources/lang/ru_RU/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/zh_HK/csv.php b/resources/lang/zh_HK/csv.php index 4acb52efdc..4424610191 100644 --- a/resources/lang/zh_HK/csv.php +++ b/resources/lang/zh_HK/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/lang/zh_TW/csv.php b/resources/lang/zh_TW/csv.php index e94574c27b..c55b9cea43 100644 --- a/resources/lang/zh_TW/csv.php +++ b/resources/lang/zh_TW/csv.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ -declare(strict_types = 1); +declare(strict_types=1); return [ diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig index 39a1729876..a29f420fa8 100644 --- a/resources/views/accounts/show.twig +++ b/resources/views/accounts/show.twig @@ -144,13 +144,13 @@ // uri's for charts: var chartUri = '{{ chartUri }}'; {% if start and end %} - var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}'; - var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}'; - var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, start.format('Ymd'), end.format('Ymd')]) }}'; + var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}'; + var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}'; + var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, start.format('Ymd'), end.format('Ymd')]) }}'; {% else %} - var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, 'all', 'all']) }}'; - var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, 'all', 'all']) }}'; - var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, 'all', 'all']) }}'; + var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, 'all', 'all']) }}'; + var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, 'all', 'all']) }}'; + var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, 'all', 'all']) }}'; {% endif %} diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig index 3928cd2714..9ecec09211 100644 --- a/resources/views/budgets/index.twig +++ b/resources/views/budgets/index.twig @@ -72,14 +72,14 @@ {% if budgets.count > 0 and inactive.count > 0 %} -
-
-

{{ 'createBudget'|_ }}

+
+
+

{{ 'createBudget'|_ }}

+
+
+ {{ 'createBudget'|_ }} +
-
- {{ 'createBudget'|_ }} -
-
{% endif %}
diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig index 9fa172096b..13a43903b2 100644 --- a/resources/views/categories/show.twig +++ b/resources/views/categories/show.twig @@ -110,10 +110,10 @@ {{ period.earned|formatAmount }} {% if period.earned != 0 and period.spent != 0 %} - - {{ 'sum'|_ }} - {{ period.sum|formatAmount }} - + + {{ 'sum'|_ }} + {{ period.sum|formatAmount }} + {% endif %} {{ 'transferred'|_ }} diff --git a/resources/views/demo/import/configure.twig b/resources/views/demo/import/configure.twig index a94b4914bb..eee25e4315 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') }} diff --git a/resources/views/demo/reports/index.twig b/resources/views/demo/reports/index.twig index 535fb63c44..adf49baea5 100644 --- a/resources/views/demo/reports/index.twig +++ b/resources/views/demo/reports/index.twig @@ -1,6 +1,6 @@ {{ trans('demo.reports-index-start')|raw }} -
-
+
+
{{ 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']), diff --git a/resources/views/emails/password-html.twig b/resources/views/emails/password-html.twig index 07e4e0a80a..2b15f16191 100644 --- a/resources/views/emails/password-html.twig +++ b/resources/views/emails/password-html.twig @@ -8,6 +8,6 @@

- {{ url }} + {{ url }}

{% include 'emails.footer-html' %} diff --git a/resources/views/errors/500.twig b/resources/views/errors/500.twig index 456f0b73dd..5c90946598 100644 --- a/resources/views/errors/500.twig +++ b/resources/views/errors/500.twig @@ -1,6 +1,6 @@ - +