From 4a64a1bd4693991ea49c3f98ef9238bc4879529a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 28 Oct 2018 19:19:39 +0100 Subject: [PATCH] Update meta files for new release. --- .sandstorm/changelog.md | 34 ++++++++++++++++++++++++++++++ .sandstorm/sandstorm-pkgdef.capnp | 4 ++-- changelog.md | 1 + composer.lock | 30 +++++++++++++------------- config/firefly.php | 35 +++++++++++++++++++------------ tests/TestCase.php | 7 +++++-- 6 files changed, 79 insertions(+), 32 deletions(-) diff --git a/.sandstorm/changelog.md b/.sandstorm/changelog.md index 8ec8b15d43..f7d15ca193 100644 --- a/.sandstorm/changelog.md +++ b/.sandstorm/changelog.md @@ -1,3 +1,37 @@ +$ 4.7.8 + +- [Issue 1005](https://github.com/firefly-iii/firefly-iii/issues/1005) You can now configure Firefly III to use LDAP. +- [Issue 1071](https://github.com/firefly-iii/firefly-iii/issues/1071) You can execute transaction rules using the command line (so you can cronjob it) +- [Issue 1108](https://github.com/firefly-iii/firefly-iii/issues/1108) You can now reorder budgets. +- [Issue 1159](https://github.com/firefly-iii/firefly-iii/issues/1159) The ability to import transactions from FinTS-enabled banks. +- [Issue 1727](https://github.com/firefly-iii/firefly-iii/issues/1727) You can now use SFTP as storage for uploads and exports. +- [Issue 1733](https://github.com/firefly-iii/firefly-iii/issues/1733) You can configure Firefly III not to send emails with transaction information in them. +- [Issue 1040](https://github.com/firefly-iii/firefly-iii/issues/1040) Fixed various things that would not scale properly in the past. +- [Issue 1771](https://github.com/firefly-iii/firefly-iii/issues/1771) A link to the transaction that fits the bill. +- [Issue 1800](https://github.com/firefly-iii/firefly-iii/issues/1800) Icon updated to match others. +- MySQL database connection now forces the InnoDB to be used. +- [Issue 1583](https://github.com/firefly-iii/firefly-iii/issues/1583) Some times recurring transactions would not fire. +- [Issue 1607](https://github.com/firefly-iii/firefly-iii/issues/1607) Problems with the bunq API, finally solved?! (I feel like a clickbait YouTube video now) +- [Issue 1698](https://github.com/firefly-iii/firefly-iii/issues/1698) Certificate problems in the Docker container +- [Issue 1751](https://github.com/firefly-iii/firefly-iii/issues/1751) Bug in autocomplete +- [Issue 1760](https://github.com/firefly-iii/firefly-iii/issues/1760) Tag report bad math +- [Issue 1765](https://github.com/firefly-iii/firefly-iii/issues/1765) API inconsistencies for piggy banks. +- [Issue 1774](https://github.com/firefly-iii/firefly-iii/issues/1774) Integer exception in SQLite databases +- [Issue 1775](https://github.com/firefly-iii/firefly-iii/issues/1775) Heroku now supports all locales +- [Issue 1778](https://github.com/firefly-iii/firefly-iii/issues/1778) More autocomplete problems fixed +- [Issue 1747](https://github.com/firefly-iii/firefly-iii/issues/1747) Rules now stop at the right moment. +- [Issue 1781](https://github.com/firefly-iii/firefly-iii/issues/1781) Problems when creating new rules. +- [Issue 1784](https://github.com/firefly-iii/firefly-iii/issues/1784) Can now create a liability with an empty balance. +- [Issue 1785](https://github.com/firefly-iii/firefly-iii/issues/1785) Redirect error +- [Issue 1790](https://github.com/firefly-iii/firefly-iii/issues/1790) Show attachments for bills. +- [Issue 1792](https://github.com/firefly-iii/firefly-iii/issues/1792) Mention excluded accounts. +- [Issue 1798](https://github.com/firefly-iii/firefly-iii/issues/1798) Could not recreate deleted piggy banks +- [Issue 1805](https://github.com/firefly-iii/firefly-iii/issues/1805) Fixes when handling foreign currencies +- [Issue 1807](https://github.com/firefly-iii/firefly-iii/issues/1807) Also decrypt deleted records. +- [Issue 1812](https://github.com/firefly-iii/firefly-iii/issues/1812) Fix in transactions API +- [Issue 1815](https://github.com/firefly-iii/firefly-iii/issues/1815) Opening balance account name can now be translated. +- [Issue 1830](https://github.com/firefly-iii/firefly-iii/issues/1830) Multi-user in a single browser could leak autocomplete data. + # 4.7.7 - [Issue 954](https://github.com/firefly-iii/firefly-iii/issues/954) Some additional view chart ranges - [Issue 1710](https://github.com/firefly-iii/firefly-iii/issues/1710) Added a new currency ([hamuz](https://github.com/hamuz)) diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index afd4c76cc8..0386fbe2b9 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -15,8 +15,8 @@ const pkgdef :Spk.PackageDefinition = ( manifest = ( appTitle = (defaultText = "Firefly III"), - appVersion = 17, - appMarketingVersion = (defaultText = "4.7.7"), + appVersion = 18, + appMarketingVersion = (defaultText = "4.7.8"), actions = [ # Define your "new document" handlers here. diff --git a/changelog.md b/changelog.md index 682c41d3c6..4ab44325eb 100644 --- a/changelog.md +++ b/changelog.md @@ -40,6 +40,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - [Issue 1807](https://github.com/firefly-iii/firefly-iii/issues/1807) Also decrypt deleted records. - [Issue 1812](https://github.com/firefly-iii/firefly-iii/issues/1812) Fix in transactions API - [Issue 1815](https://github.com/firefly-iii/firefly-iii/issues/1815) Opening balance account name can now be translated. +- [Issue 1830](https://github.com/firefly-iii/firefly-iii/issues/1830) Multi-user in a single browser could leak autocomplete data. ## [4.7.7] - 2018-10-01 diff --git a/composer.lock b/composer.lock index 2b77d80074..1bc1317445 100644 --- a/composer.lock +++ b/composer.lock @@ -1299,16 +1299,16 @@ }, { "name": "laravel/framework", - "version": "v5.7.10", + "version": "v5.7.11", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "7d748c33b8c409b9b0c96704d6493853de41754d" + "reference": "52ee19c53c4fcd7fea8a83aacae5b8bc212ae19b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/7d748c33b8c409b9b0c96704d6493853de41754d", - "reference": "7d748c33b8c409b9b0c96704d6493853de41754d", + "url": "https://api.github.com/repos/laravel/framework/zipball/52ee19c53c4fcd7fea8a83aacae5b8bc212ae19b", + "reference": "52ee19c53c4fcd7fea8a83aacae5b8bc212ae19b", "shasum": "" }, "require": { @@ -1438,20 +1438,20 @@ "framework", "laravel" ], - "time": "2018-10-23T14:05:19+00:00" + "time": "2018-10-24T12:50:20+00:00" }, { "name": "laravel/passport", - "version": "v7.0.2", + "version": "v7.0.3", "source": { "type": "git", "url": "https://github.com/laravel/passport.git", - "reference": "7bb53d1ae4f8f375cc9461d232053958740002da" + "reference": "404b345775c91cd04443e77e8d6164b9727a3448" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/passport/zipball/7bb53d1ae4f8f375cc9461d232053958740002da", - "reference": "7bb53d1ae4f8f375cc9461d232053958740002da", + "url": "https://api.github.com/repos/laravel/passport/zipball/404b345775c91cd04443e77e8d6164b9727a3448", + "reference": "404b345775c91cd04443e77e8d6164b9727a3448", "shasum": "" }, "require": { @@ -1507,7 +1507,7 @@ "oauth", "passport" ], - "time": "2018-09-25T14:23:48+00:00" + "time": "2018-10-22T14:47:22+00:00" }, { "name": "laravelcollective/html", @@ -3006,16 +3006,16 @@ }, { "name": "rcrowe/twigbridge", - "version": "v0.9.8", + "version": "v0.9.9", "source": { "type": "git", "url": "https://github.com/rcrowe/TwigBridge.git", - "reference": "d0c998ae6d39f154c4e2d01ef914e49d0b7d5d68" + "reference": "04ee299bf1eecf55d27120c85da71720aabe7f40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rcrowe/TwigBridge/zipball/d0c998ae6d39f154c4e2d01ef914e49d0b7d5d68", - "reference": "d0c998ae6d39f154c4e2d01ef914e49d0b7d5d68", + "url": "https://api.github.com/repos/rcrowe/TwigBridge/zipball/04ee299bf1eecf55d27120c85da71720aabe7f40", + "reference": "04ee299bf1eecf55d27120c85da71720aabe7f40", "shasum": "" }, "require": { @@ -3074,7 +3074,7 @@ "laravel", "twig" ], - "time": "2018-08-31T13:30:10+00:00" + "time": "2018-10-25T19:11:00+00:00" }, { "name": "swiftmailer/swiftmailer", diff --git a/config/firefly.php b/config/firefly.php index fa6f94ec9c..ddff5a6df3 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -91,9 +91,9 @@ return [ 'is_demo_site' => false, ], 'encryption' => null === env('USE_ENCRYPTION') || env('USE_ENCRYPTION') === true, - 'version' => '4.7.7', - 'api_version' => '0.8', - 'db_version' => 5, + 'version' => '4.7.8', + 'api_version' => '0.81', + 'db_version' => 6, 'maxUploadSize' => 15242880, 'login_provider' => env('LOGIN_PROVIDER', 'eloquent'), 'allowedMimes' => [ @@ -239,16 +239,25 @@ return [ 'languages' => [ // completed languages 'en_US' => ['name_locale' => 'English', 'name_english' => 'English'], - 'es_ES' => ['name_locale' => 'Español', 'name_english' => 'Spanish'], - 'de_DE' => ['name_locale' => 'Deutsch', 'name_english' => 'German'], - 'fr_FR' => ['name_locale' => 'Français', 'name_english' => 'French'], - //'id_ID' => ['name_locale' => 'Bahasa Indonesia', 'name_english' => 'Indonesian'], - 'it_IT' => ['name_locale' => 'Italiano', 'name_english' => 'Italian'], - 'nl_NL' => ['name_locale' => 'Nederlands', 'name_english' => 'Dutch'], - 'pl_PL' => ['name_locale' => 'Polski', 'name_english' => 'Polish '], - //'pt_BR' => ['name_locale' => 'Português do Brasil', 'name_english' => 'Portuguese (Brazil)'], - 'ru_RU' => ['name_locale' => 'Русский', 'name_english' => 'Russian'], - //'tr_TR' => ['name_locale' => 'Türkçe', 'name_english' => 'Turkish'], + 'es_ES' => ['name_locale' => 'Español', 'name_english' => 'Spanish'], // 2018-10-26: 96% + 'de_DE' => ['name_locale' => 'Deutsch', 'name_english' => 'German'], // 2018-10-26: 100% + 'fr_FR' => ['name_locale' => 'Français', 'name_english' => 'French'], // 2018-10-26: 100% + //'id_ID' => ['name_locale' => 'Bahasa Indonesia', 'name_english' => 'Indonesian'], // 2018-10-26: 61% :( + 'it_IT' => ['name_locale' => 'Italiano', 'name_english' => 'Italian'], // 2018-10-26: 100% + 'nl_NL' => ['name_locale' => 'Nederlands', 'name_english' => 'Dutch'], // 2018-10-26: 100% + 'pl_PL' => ['name_locale' => 'Polski', 'name_english' => 'Polish '], // 2018-10-26: 76% + 'pt_BR' => ['name_locale' => 'Português do Brasil', 'name_english' => 'Portuguese (Brazil)'], // 2018-10-26: 77% + 'ru_RU' => ['name_locale' => 'Русский', 'name_english' => 'Russian'], // 2018-10-26: 80% + //'tr_TR' => ['name_locale' => 'Türkçe', 'name_english' => 'Turkish'], // 2018-10-26: 71% + + // very far away: + //'ca_ES' => ['name_locale' => 'Catalan', 'name_english' => 'Catalan'], // 2018-10-26: 0% + //'cs_CZ' => ['name_locale' => 'Czech', 'name_english' => 'Czech'], // 2018-10-26: 8% + //'he_IL' => ['name_locale' => 'Hebrew', 'name_english' => 'Hebrew'], // 2018-10-26: 3% + //'hu_HU' => ['name_locale' => 'Hungarian', 'name_english' => 'Hungarian'], // 2018-10-26: 40% + //'nb_NO' => ['name_locale' => 'Norwegian', 'name_english' => 'Norwegian'], // 2018-10-26: 54% + //'sl_SI' => ['name_locale' => 'Slovenian', 'name_english' => 'Slovenian'], // 2018-10-26: 10% + //'uk_UA' => ['name_locale' => 'Ukranian', 'name_english' => 'Ukranian'], // 2018-10-26: 3% ], 'transactionTypesByWhat' => [ 'expenses' => ['Withdrawal'], diff --git a/tests/TestCase.php b/tests/TestCase.php index a00b304211..a107e03cb0 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace Tests; use Carbon\Carbon; +use Closure; use DB; use Exception; use FireflyIII\Models\Account; @@ -188,11 +189,13 @@ abstract class TestCase extends BaseTestCase } /** - * @param string $class + * @param string $class + * + * @param Closure|null $closure * * @return \Mockery\MockInterface */ - protected function mock($class): \Mockery\MockInterface + protected function mock($class, Closure $closure = null): \Mockery\MockInterface { Log::debug(sprintf('Will now mock %s', $class)); $object = Mockery::mock($class);