Compare commits

..

210 Commits

Author SHA1 Message Date
James Cole
6535f86001 Merge branch 'release/v6.0.7' 2023-04-08 08:58:39 +02:00
James Cole
531abc9f3d Merge pull request #7344 from firefly-iii/release-607
Meta for new release
2023-04-08 08:44:21 +02:00
James Cole
f7a02bdc2a Meta for new release 2023-04-08 08:43:41 +02:00
James Cole
af38f31147 Merge branch 'main' into develop 2023-04-08 06:57:40 +02:00
James Cole
4b4b5ef319 Merge pull request #7343 from firefly-iii/dark-mode-button
Dark mode button
2023-04-08 06:56:05 +02:00
James Cole
88fd76f0f1 Dark mode button 2023-04-08 06:55:38 +02:00
James Cole
3d1d064720 Merge pull request #7342 from firefly-iii/fix-7310
Fix #7310
2023-04-08 06:39:54 +02:00
James Cole
9ca8161588 Fix #7310 2023-04-08 06:39:25 +02:00
James Cole
5eb2b2fc5e Merge pull request #7341 from firefly-iii/fix-7311
Fix #7311
2023-04-08 06:29:10 +02:00
James Cole
d991df89c8 Fix #7311 2023-04-08 06:28:45 +02:00
James Cole
49339ea9b0 Merge pull request #7340 from firefly-iii/catch-errors
Catch errors
2023-04-08 06:28:22 +02:00
James Cole
561359b14f Add command to force migrations. 2023-04-07 20:54:15 +02:00
James Cole
79a4eec96e Catch DB errors 2023-04-07 19:33:19 +02:00
James Cole
dd11f98be7 Catch errors in database table create statements. 2023-04-07 18:21:12 +02:00
James Cole
40e2bf7cac Merge pull request #7335 from fengkaijia/patch-1
Fix upload attachment via API
2023-04-07 17:01:08 +02:00
James Cole
73e3a11be9 Merge pull request #7333 from firefly-iii/JC5-patch-1
Update cleanup.yml
2023-04-06 09:12:05 +02:00
James Cole
a180c37c58 Update cleanup.yml
Signed-off-by: James Cole <james@firefly-iii.org>
2023-04-06 09:11:55 +02:00
Kaijia Feng
aff802713e Fix upload attachment via API
Signed-off-by: Kaijia Feng <feng@kaijia.me>
2023-04-06 15:07:35 +08:00
James Cole
ebc7fad1fa Merge pull request #7331 from firefly-iii/error-catching
Various improved error catching.
2023-04-05 20:22:54 +02:00
James Cole
5068fc76c1 Various improved error catching. 2023-04-05 20:22:17 +02:00
James Cole
70b6e39cd7 Merge pull request #7323 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-1.10.10
Bump phpstan/phpstan from 1.10.9 to 1.10.10
2023-04-03 08:51:15 +02:00
dependabot[bot]
31fc915b51 Bump phpstan/phpstan from 1.10.9 to 1.10.10
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.9 to 1.10.10.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.10.x/CHANGELOG.md)
- [Commits](https://github.com/phpstan/phpstan/compare/1.10.9...1.10.10)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-03 03:56:30 +00:00
James Cole
dfed56ed1b Merge pull request #7320 from firefly-iii/email-defaults
Better defaults for email.
2023-04-02 19:43:53 +02:00
James Cole
7f6d2877fb Better defaults for email. 2023-04-02 19:43:24 +02:00
James Cole
d9315dcbfe Merge pull request #7319 from firefly-iii/fix-7317
Fix #7317
2023-04-02 19:42:32 +02:00
James Cole
6fbf4ec6f1 Fix #7317 2023-04-02 19:42:06 +02:00
James Cole
2e32acc3c9 Merge pull request #7309 from firefly-iii/fix-7308
Fix https://github.com/firefly-iii/firefly-iii/issues/7308
2023-04-01 10:44:47 +02:00
James Cole
328216534b Fix https://github.com/firefly-iii/firefly-iii/issues/7308 2023-04-01 10:44:09 +02:00
James Cole
dea6e2c83f Merge tag 'v6.0.6' into develop
v6.0.6
2023-04-01 07:51:42 +02:00
James Cole
31f4f08e54 Merge branch 'release/v6.0.6' 2023-04-01 07:51:40 +02:00
James Cole
c4f2519b6f Update meta files for new release v6.0.6. 2023-04-01 07:50:53 +02:00
James Cole
0359a98681 Merge pull request #7307 from firefly-iii/fix-7248
Fix #7248
2023-04-01 07:11:53 +02:00
James Cole
c69b24c1d2 Fix #7248 2023-04-01 07:11:30 +02:00
James Cole
d50c560ed2 Merge pull request #7306 from firefly-iii/improve-contrast
Improved contrast for dark mode
2023-04-01 07:09:59 +02:00
James Cole
21ffd70523 Merge pull request #7305 from firefly-iii/fix-7261
Fix #7261
2023-04-01 07:09:34 +02:00
James Cole
664e9fe8da Fix #7261 2023-04-01 07:09:20 +02:00
James Cole
c948490eb6 Merge pull request #7304 from firefly-iii/use-facade
Use another facade
2023-04-01 07:05:21 +02:00
James Cole
5b3bcc7611 Merge pull request #7303 from firefly-iii/fox-expense
Fix issue with opposing account creation
2023-04-01 07:05:00 +02:00
James Cole
c7d9ca9a61 Use another facade 2023-04-01 07:04:42 +02:00
James Cole
259bad4487 Fix issue with opposing account creation 2023-04-01 07:02:51 +02:00
James Cole
73d3a82519 Merge pull request #7302 from firefly-iii/ac-accounts
Expand AC
2023-03-31 19:23:08 +02:00
James Cole
6f4ca53907 Merge pull request #7301 from firefly-iii/fix-7299
Fix #7299
2023-03-31 19:22:38 +02:00
James Cole
5111aaa123 Merge pull request #7300 from firefly-iii/mail-error
Mail error
2023-03-31 19:21:58 +02:00
James Cole
c903b82b7b Less dramatic mail error 2023-03-31 19:21:29 +02:00
James Cole
ed00d97ff9 Fix #7299 2023-03-31 19:21:09 +02:00
James Cole
9939ed0aaf Expand AC 2023-03-31 19:20:26 +02:00
James Cole
8ea32714f6 Merge pull request #7280 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-1.10.8
Bump phpstan/phpstan from 1.10.7 to 1.10.8
2023-03-27 06:23:18 +02:00
James Cole
f9fb77690b Merge pull request #7281 from firefly-iii/dependabot/composer/develop/league/commonmark-2.4.0
Bump league/commonmark from 2.3.9 to 2.4.0
2023-03-27 06:23:08 +02:00
James Cole
98b28c75b7 Merge pull request #7279 from firefly-iii/fix-7278
Fix https://github.com/firefly-iii/firefly-iii/issues/7278
2023-03-27 06:22:42 +02:00
dependabot[bot]
405be07ba8 Bump league/commonmark from 2.3.9 to 2.4.0
Bumps [league/commonmark](https://github.com/thephpleague/commonmark) from 2.3.9 to 2.4.0.
- [Release notes](https://github.com/thephpleague/commonmark/releases)
- [Changelog](https://github.com/thephpleague/commonmark/blob/2.4/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/commonmark/compare/2.3.9...2.4.0)

---
updated-dependencies:
- dependency-name: league/commonmark
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-27 03:56:35 +00:00
dependabot[bot]
5a84e222fd Bump phpstan/phpstan from 1.10.7 to 1.10.8
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.7 to 1.10.8.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.10.x/CHANGELOG.md)
- [Commits](https://github.com/phpstan/phpstan/compare/1.10.7...1.10.8)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-27 03:56:28 +00:00
James Cole
36b0cf04ba Fix https://github.com/firefly-iii/firefly-iii/issues/7278 2023-03-26 19:19:10 +02:00
James Cole
70c11d6634 Merge pull request #7274 from firefly-iii/fix-bad-rule-action
Fix bad rule action
2023-03-25 13:43:20 +01:00
James Cole
eebfb0cb40 Fixes issue where rule actions would find the wrong account. 2023-03-25 13:42:26 +01:00
James Cole
2500cc55e2 Merge pull request #7273 from firefly-iii/ac-accounts
Ac accounts
2023-03-25 13:18:29 +01:00
James Cole
c3b99c322d Function autocomplete button 2023-03-25 13:18:05 +01:00
James Cole
976128a435 Rule action will create revenue account instead of search for liability 2023-03-25 11:34:29 +01:00
James Cole
3be55adaeb Fix route 2023-03-25 11:34:02 +01:00
James Cole
141a828947 Improved contrast for dark mode 2023-03-25 11:33:42 +01:00
James Cole
0386d5e09f Partial implementation of administration aware account auto complete 2023-03-25 11:32:33 +01:00
James Cole
17d308cfde Merge pull request #7257 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-deprecation-rules-1.1.3 2023-03-20 07:16:58 +01:00
James Cole
c540e3ff71 Merge pull request #7256 from firefly-iii/dependabot/composer/develop/laravel/framework-10.4.1 2023-03-20 06:33:30 +01:00
dependabot[bot]
8641cbd619 Bump phpstan/phpstan-deprecation-rules from 1.1.2 to 1.1.3
Bumps [phpstan/phpstan-deprecation-rules](https://github.com/phpstan/phpstan-deprecation-rules) from 1.1.2 to 1.1.3.
- [Release notes](https://github.com/phpstan/phpstan-deprecation-rules/releases)
- [Commits](https://github.com/phpstan/phpstan-deprecation-rules/compare/1.1.2...1.1.3)

---
updated-dependencies:
- dependency-name: phpstan/phpstan-deprecation-rules
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-20 05:09:25 +00:00
James Cole
70f76cd538 Merge pull request #7255 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-1.10.7 2023-03-20 06:04:50 +01:00
dependabot[bot]
420a765295 Bump laravel/framework from 10.3.3 to 10.4.1
Bumps [laravel/framework](https://github.com/laravel/framework) from 10.3.3 to 10.4.1.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/10.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v10.3.3...v10.4.1)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-20 03:56:46 +00:00
dependabot[bot]
c926d85c8b Bump phpstan/phpstan from 1.10.6 to 1.10.7
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.6 to 1.10.7.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.10.x/CHANGELOG.md)
- [Commits](https://github.com/phpstan/phpstan/compare/1.10.6...1.10.7)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-20 03:56:27 +00:00
James Cole
7668a854f7 Merge pull request #7251 from firefly-iii/accuracy-fix
Better accuracy for database. Does not affect current users.
2023-03-19 10:39:57 +01:00
James Cole
c30e1c1973 Better accuracy for database. Does not affect current users. 2023-03-19 10:39:40 +01:00
James Cole
bd556f1934 Merge branch 'release/v6.0.5' 2023-03-18 14:49:05 +01:00
James Cole
9530e928d5 Merge tag 'v6.0.5' into develop
v6.0.5
2023-03-18 14:49:05 +01:00
James Cole
ae367aa736 Merge pull request #7246 from firefly-iii/v605
Meta files for v6.0.5
2023-03-18 14:47:52 +01:00
James Cole
3ccff2969b Meta files for v6.0.5 2023-03-18 14:47:35 +01:00
James Cole
530abb1da6 Merge pull request #7245 from firefly-iii/drop-bc-scale
Drop bc scale
2023-03-18 14:36:26 +01:00
James Cole
9fe70fb8d8 Drop BCscale significantly. This breaks support for long crypto currencies. 2023-03-18 14:35:08 +01:00
James Cole
b0215a23fb Merge branch 'main' into develop 2023-03-15 05:45:15 +01:00
James Cole
48735b1a5b Merge pull request #7233 from firefly-iii/dependabot/npm_and_yarn/frontend/webpack-5.76.1
Bump webpack from 5.72.0 to 5.76.1 in /frontend
2023-03-15 05:44:25 +01:00
dependabot[bot]
3c0b802667 Bump webpack from 5.72.0 to 5.76.1 in /frontend
Bumps [webpack](https://github.com/webpack/webpack) from 5.72.0 to 5.76.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.72.0...v5.76.1)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-14 23:54:24 +00:00
James Cole
9bfad07f8c Merge pull request #7232 from firefly-iii/fix-7227
Fix https://github.com/firefly-iii/firefly-iii/issues/7227
2023-03-14 18:31:51 +01:00
James Cole
5c91da80e1 Merge pull request #7231 from firefly-iii/fix-7221
Fix https://github.com/firefly-iii/firefly-iii/issues/7221
2023-03-14 18:31:32 +01:00
James Cole
e465c93ffc Fix https://github.com/firefly-iii/firefly-iii/issues/7227 2023-03-14 18:30:59 +01:00
James Cole
8e56fa4ef8 Fix https://github.com/firefly-iii/firefly-iii/issues/7221 2023-03-14 18:09:44 +01:00
James Cole
f56de6e719 Merge pull request #7218 from firefly-iii/develop
Release v6.0.4
2023-03-12 18:25:25 +01:00
James Cole
86ba1d151a Merge pull request #7217 from firefly-iii/v604
v604 into develop
2023-03-12 18:24:40 +01:00
James Cole
8d24db14e9 Update packages. 2023-03-12 18:23:18 +01:00
James Cole
cead122d96 Meta files for new release 2023-03-12 18:22:56 +01:00
James Cole
b7dd335fb7 Meta files for release v6.0.4 2023-03-12 18:18:02 +01:00
James Cole
20a7092fe3 Merge pull request #7213 from marcoil/catalan_name
Update Catalan description
2023-03-12 16:09:24 +01:00
James Cole
1d3da33e1d Merge pull request #7216 from firefly-iii/fix-7214
Possible fix for #7214
2023-03-12 16:06:31 +01:00
James Cole
e36675e232 Possible fix for #7214 2023-03-12 16:06:12 +01:00
Marc Ordinas i Llopis
aa8588758a Update Catalan description
Signed-off-by: Marc Ordinas i Llopis <mail@marcoil.org>
2023-03-12 13:48:06 +01:00
James Cole
47a58738d4 Merge pull request #7211 from firefly-iii/develop
Release v6.0.3
2023-03-12 11:04:35 +01:00
James Cole
e0a31d29a4 Merge pull request #7210 from firefly-iii/603
chore: Meta data for 603
2023-03-12 11:00:24 +01:00
James Cole
45369868ad chore: Meta data for 603 2023-03-12 10:59:35 +01:00
James Cole
639c51d651 Merge pull request #7202 from firefly-iii/fix-7201
Fix #7201
2023-03-11 15:05:31 +01:00
James Cole
3d424972cc Fix #7201 2023-03-11 15:04:16 +01:00
James Cole
96fd4da6d8 Merge pull request #7198 from firefly-iii/develop
Release v6.0.2
2023-03-11 08:32:53 +01:00
James Cole
a97a0d461d Merge pull request #7197 from firefly-iii/602
update meta files for 602
2023-03-11 08:32:04 +01:00
James Cole
8d3170785e update meta files for 602 2023-03-11 08:31:27 +01:00
James Cole
ae373a15c5 Merge pull request #7195 from firefly-iii/fix-7142
Fix #7142
2023-03-11 07:45:47 +01:00
James Cole
1f342ed592 Fix #7142 2023-03-11 07:44:45 +01:00
James Cole
3e04f14665 Merge pull request #7194 from firefly-iii/fix-7192
Extra code for #7192
2023-03-11 07:13:59 +01:00
James Cole
dbf83df363 Extra code for #7192 2023-03-11 07:13:39 +01:00
James Cole
15bfc0d6fa Merge pull request #7193 from firefly-iii/fix-7189
Fix #7189
2023-03-11 07:09:50 +01:00
James Cole
f3fc1d8382 Fix #7189 2023-03-11 07:09:27 +01:00
James Cole
07cb7dd06e Merge pull request #7191 from firefly-iii/fix-7188
Fix #7188
2023-03-11 05:50:29 +01:00
James Cole
38624442d1 Fix #7188 2023-03-11 05:50:10 +01:00
James Cole
258dfb3d11 Merge pull request #7190 from firefly-iii/fix-7186
Fix #7186
2023-03-11 05:48:41 +01:00
James Cole
51ddfcdaaa Fix #7186 2023-03-11 05:38:54 +01:00
James Cole
2a0acdbb27 Merge pull request #7185 from firefly-iii/develop
Develop
2023-03-10 19:15:44 +01:00
James Cole
99bd28f21e Merge pull request #7184 from firefly-iii/metadata
Meta data for new release.
2023-03-10 19:12:08 +01:00
James Cole
643ae91bb5 Meta data for new release. 2023-03-10 19:11:27 +01:00
James Cole
591e3ab3ec Merge pull request #7178 from firefly-iii/fix-7177
Fix #7177
2023-03-09 08:15:18 +01:00
James Cole
edd7aed691 Fix #7177 2023-03-09 08:14:30 +01:00
James Cole
2e89586559 Merge pull request #7176 from firefly-iii/fix-7175
Fixes #7175
2023-03-09 06:34:09 +01:00
James Cole
173f593a7e Fixes #7175 2023-03-09 06:33:23 +01:00
James Cole
d4839c8818 Merge pull request #7174 from firefly-iii/fix-7172
Fix 7172
2023-03-08 20:47:18 +01:00
James Cole
a122dba0ad Fix https://github.com/firefly-iii/firefly-iii/issues/7172 2023-03-08 20:40:51 +01:00
James Cole
ae813a536e Merge pull request #7171 from firefly-iii/fix-7166
Fix #7166
2023-03-07 19:55:15 +01:00
James Cole
b9d174238b Fix #7166 2023-03-07 19:54:58 +01:00
James Cole
fbf5adbe79 Merge pull request #7170 from firefly-iii/fix-7165
Fix https://github.com/firefly-iii/firefly-iii/issues/7165
2023-03-07 19:51:36 +01:00
James Cole
c676a65f93 Fix https://github.com/firefly-iii/firefly-iii/issues/7165 2023-03-07 19:50:20 +01:00
James Cole
5ab8fbddcb Merge pull request #7169 from firefly-iii/fix-7124
Fix https://github.com/firefly-iii/firefly-iii/issues/7124
2023-03-07 19:37:23 +01:00
James Cole
b942fa4b09 Fix https://github.com/firefly-iii/firefly-iii/issues/7124 2023-03-07 19:36:54 +01:00
James Cole
8ee358551c Merge pull request #7168 from firefly-iii/fix-7120
Fix https://github.com/firefly-iii/firefly-iii/issues/7120
2023-03-07 19:14:48 +01:00
James Cole
a5f3b4533b Fix https://github.com/firefly-iii/firefly-iii/issues/7120 2023-03-07 19:14:15 +01:00
James Cole
e258efe1bf Merge pull request #7167 from firefly-iii/fix-7104
Fix https://github.com/firefly-iii/firefly-iii/issues/7104
2023-03-07 19:11:00 +01:00
James Cole
f9a213e06f Fix https://github.com/firefly-iii/firefly-iii/issues/7104 2023-03-07 19:10:32 +01:00
James Cole
05bd732e7c Merge pull request #7163 from firefly-iii/issue-template-updates
Small issue template updates
2023-03-07 05:23:04 +01:00
James Cole
70050678c5 Small issue template updates 2023-03-07 05:22:36 +01:00
James Cole
6a649f2f42 Merge pull request #7160 from firefly-iii/fix-7159
Fix #7159
2023-03-06 21:00:54 +01:00
James Cole
6912e05677 Fix #7159 2023-03-06 21:00:27 +01:00
James Cole
c78fa8eaea Merge pull request #7151 from firefly-iii/fix-7144
Fix #7144
2023-03-06 05:55:20 +01:00
James Cole
5a06e3523b Merge pull request #7150 from firefly-iii/fix-7140
Fix #7140 by better validating header content.
2023-03-06 05:54:36 +01:00
James Cole
b34cb0428b Merge pull request #7149 from firefly-iii/mail-provider
Make sure default mail provider is "log", not smtp
2023-03-06 05:53:11 +01:00
James Cole
ce3c866168 Make sure default mail provider is "log", not smtp 2023-03-06 05:52:41 +01:00
James Cole
4ada2f3e3c Merge pull request #7147 from firefly-iii/dependabot/composer/develop/nunomaduro/collision-7.1.0
Bump nunomaduro/collision from 7.0.5 to 7.1.0
2023-03-06 05:47:14 +01:00
dependabot[bot]
ad739c1d84 Bump nunomaduro/collision from 7.0.5 to 7.1.0
Bumps [nunomaduro/collision](https://github.com/nunomaduro/collision) from 7.0.5 to 7.1.0.
- [Release notes](https://github.com/nunomaduro/collision/releases)
- [Changelog](https://github.com/nunomaduro/collision/blob/v7.x/CHANGELOG.md)
- [Commits](https://github.com/nunomaduro/collision/compare/v7.0.5...v7.1.0)

---
updated-dependencies:
- dependency-name: nunomaduro/collision
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-06 04:46:06 +00:00
James Cole
60af2c4232 Merge pull request #7146 from firefly-iii/dependabot/composer/develop/nunomaduro/larastan-2.5.1 2023-03-06 05:45:29 +01:00
dependabot[bot]
cc69f50106 Bump nunomaduro/larastan from 2.4.1 to 2.5.1
Bumps [nunomaduro/larastan](https://github.com/nunomaduro/larastan) from 2.4.1 to 2.5.1.
- [Release notes](https://github.com/nunomaduro/larastan/releases)
- [Changelog](https://github.com/nunomaduro/larastan/blob/master/RELEASE.md)
- [Commits](https://github.com/nunomaduro/larastan/compare/2.4.1...2.5.1)

---
updated-dependencies:
- dependency-name: nunomaduro/larastan
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-06 03:56:26 +00:00
James Cole
0f57094b17 Fix #7144 2023-03-05 19:26:33 +01:00
James Cole
dad738ae42 Fix #7140 by better validating header content. 2023-03-05 17:07:27 +01:00
James Cole
3df05eb63c Merge pull request #7136 from firefly-iii/fix-7130
Fix #7130
2023-03-05 08:00:11 +01:00
James Cole
57b83dd239 Fix #7130 2023-03-05 07:59:48 +01:00
James Cole
1539dcffd5 Revert "Fix #7130"
This reverts commit b4a09efb8b.
2023-03-05 07:57:40 +01:00
James Cole
b4a09efb8b Fix #7130 2023-03-05 07:56:37 +01:00
James Cole
e82b372f75 Merge pull request #7134 from firefly-iii/fix-7131
Fix #7131 by expanding the global ajaxSetup instructions.
2023-03-05 07:52:09 +01:00
James Cole
83a89181bc Add JSON.stringify 2023-03-05 07:00:04 +01:00
James Cole
b1e08b1084 Fix #7131 by expanding the global ajaxSetup instructions. 2023-03-05 06:09:25 +01:00
James Cole
0eb582ab3b Merge pull request #7129 from firefly-iii/common-mail-errors
Catch common mail errors
2023-03-04 22:26:43 +01:00
James Cole
07b58b4200 Catch common mail errors 2023-03-04 22:26:09 +01:00
James Cole
8807f04599 Merge pull request #7128 from firefly-iii/fix-7127
Fix 7127
2023-03-04 22:19:17 +01:00
James Cole
4657d34ae4 Fix request 2023-03-04 22:18:37 +01:00
James Cole
79951453cd Switch the button 2023-03-04 22:17:19 +01:00
James Cole
5291f485ac Fix #7127 by adding an option to the API 2023-03-04 22:16:59 +01:00
James Cole
ed75d84376 Merge pull request #7116 from firefly-iii/fix-6985
Fix 6985
2023-03-04 07:36:10 +01:00
James Cole
a7011376cb Add package. 2023-03-04 07:35:51 +01:00
James Cole
6c4bd84b66 Fix #6985 2023-03-04 07:35:30 +01:00
James Cole
c4418857e6 Merge pull request #7114 from firefly-iii/fix-7112
Fix https://github.com/firefly-iii/firefly-iii/issues/7112
2023-03-04 07:18:55 +01:00
James Cole
5d316ea26a Fix https://github.com/firefly-iii/firefly-iii/issues/7112 2023-03-04 07:18:20 +01:00
James Cole
4a0887c978 Merge pull request #7109 from firefly-iii/css-fixes
CSS fixes for subdirectories. Full credits to @GaneshKandu
2023-03-03 09:15:11 +01:00
James Cole
dbfceafb02 CSS fixes for subdirectories. Full credits to @GaneshKandu 2023-03-03 09:14:44 +01:00
James Cole
4db73285b7 Merge branch 'main' into develop 2023-03-03 06:22:08 +01:00
James Cole
876ea8bb07 Merge pull request #7103 from firefly-iii/dependabot/npm_and_yarn/frontend/dns-packet-5.4.0
Bump dns-packet from 5.3.1 to 5.4.0 in /frontend
2023-03-03 06:21:40 +01:00
dependabot[bot]
e0e90845e7 Bump dns-packet from 5.3.1 to 5.4.0 in /frontend
Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 5.3.1 to 5.4.0.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mafintosh/dns-packet/compare/v5.3.1...5.4.0)

---
updated-dependencies:
- dependency-name: dns-packet
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-02 21:42:01 +00:00
James Cole
f1223a5a3f Merge tag 'v6.0.0' into develop
v6.0.0
2023-03-02 21:21:12 +01:00
James Cole
1a3720bfaa Merge branch 'release/v6.0.0' 2023-03-02 21:21:11 +01:00
James Cole
1ddcc51c48 Merge pull request #7102 from firefly-iii/final-60
Final 60
2023-03-02 21:19:40 +01:00
James Cole
9f43ea3118 Update packages. 2023-03-02 21:19:17 +01:00
James Cole
0fe4ac9ef5 Update files for 6.0.0 2023-03-02 21:18:06 +01:00
James Cole
d6d395eccd Merge pull request #7101 from firefly-iii/fix-liabilities
Fix liabilities
2023-03-02 21:08:20 +01:00
James Cole
a26f5e2e6d Do not remove liabilities. 2023-03-02 21:06:53 +01:00
James Cole
849e006eda Merge pull request #7094 from firefly-iii/fix-7093
Fix https://github.com/firefly-iii/firefly-iii/issues/7093
2023-03-01 07:32:39 +01:00
James Cole
f70a4511c6 Fix https://github.com/firefly-iii/firefly-iii/issues/7093 2023-03-01 07:32:19 +01:00
James Cole
21ba311ecf Merge pull request #7092 from firefly-iii/fix-broken-chart
Fix broken chart
2023-03-01 06:41:16 +01:00
James Cole
fb0a100a7f Fix broken chart 2023-03-01 06:40:58 +01:00
James Cole
2295110cf1 Merge pull request #7090 from firefly-iii/dependabot/composer/develop/laravel/framework-10.1.5
Bump laravel/framework from 10.1.4 to 10.1.5
2023-02-27 06:05:10 +01:00
James Cole
3c82c9af8b Merge pull request #7089 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-1.10.3
Bump phpstan/phpstan from 1.10.2 to 1.10.3
2023-02-27 06:05:01 +01:00
James Cole
df78aa2f0d Merge pull request #7091 from firefly-iii/dark-mode-arrow
Dark mode arrow
2023-02-27 06:04:49 +01:00
James Cole
1ac18909b4 Dark mode arrow 2023-02-27 06:04:32 +01:00
dependabot[bot]
07d793e9f7 Bump laravel/framework from 10.1.4 to 10.1.5
Bumps [laravel/framework](https://github.com/laravel/framework) from 10.1.4 to 10.1.5.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/10.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v10.1.4...v10.1.5)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-27 03:56:47 +00:00
dependabot[bot]
2a7b540a95 Bump phpstan/phpstan from 1.10.2 to 1.10.3
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.2 to 1.10.3.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.10.x/CHANGELOG.md)
- [Commits](https://github.com/phpstan/phpstan/compare/1.10.2...1.10.3)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-27 03:56:30 +00:00
James Cole
5cdecf7d04 Merge pull request #7088 from firefly-iii/fix-7079
Update translations.
2023-02-26 19:49:16 +01:00
James Cole
1a0e6ffffb Update translations. 2023-02-26 19:48:15 +01:00
James Cole
c0cfc60da6 Merge pull request #7087 from firefly-iii/fix-7079
Date fix for https://github.com/firefly-iii/firefly-iii/issues/7079
2023-02-26 19:41:59 +01:00
James Cole
9f831a8b3d Date fix for https://github.com/firefly-iii/firefly-iii/issues/7079 2023-02-26 19:41:01 +01:00
James Cole
ec3ee2f995 Merge pull request #7084 from firefly-iii/fix-7083
Fix https://github.com/firefly-iii/firefly-iii/issues/7083
2023-02-26 13:30:57 +01:00
James Cole
25ca02f541 Fix https://github.com/firefly-iii/firefly-iii/issues/7083 2023-02-26 13:30:14 +01:00
James Cole
776c59faea Merge pull request #7080 from firefly-iii/six
Six
2023-02-25 09:08:47 +01:00
James Cole
a4b1587a78 Fix week number 2023-02-25 09:08:10 +01:00
James Cole
1d79eea69e Update changelog. 2023-02-25 08:42:19 +01:00
James Cole
b369b6e7b8 Fix https://github.com/firefly-iii/firefly-iii/issues/7079 2023-02-25 08:38:50 +01:00
James Cole
3832297d69 Merge pull request #7075 from firefly-iii/six
Fix audit processor
2023-02-24 06:04:04 +01:00
James Cole
a7e64a130e Fix audit processor 2023-02-24 06:03:41 +01:00
James Cole
73715dc0b9 Merge pull request #7074 from firefly-iii/six
Six
2023-02-24 05:55:21 +01:00
James Cole
8f66c93ad0 Upgrade to Laravel 10 2023-02-24 05:53:32 +01:00
James Cole
bcaf6402b5 Final files for 6.0.0 2023-02-24 05:30:15 +01:00
James Cole
16b0ee0c79 Merge pull request #7071 from firefly-iii/fix-prune
Update prune workflow.
2023-02-23 07:04:09 +01:00
James Cole
1033655615 Update prune workflow. 2023-02-23 07:03:47 +01:00
James Cole
6d327b98d4 Merge pull request #7070 from firefly-iii/fix-translations
Update translations and fix some code.
2023-02-22 19:55:29 +01:00
James Cole
585cfddfd7 Update translations and fix some code. 2023-02-22 19:54:19 +01:00
James Cole
a18cd23154 Merge pull request #7068 from firefly-iii/cleanup-comments
Cleanup comments
2023-02-22 18:16:02 +01:00
James Cole
e421b29b01 Clean up code and comments. 2023-02-22 18:14:14 +01:00
James Cole
e6dc881f56 Clean up comments 2023-02-22 18:03:31 +01:00
James Cole
01308e2076 Merge pull request #7067 from firefly-iii/code-cleanup
Various code cleanup, see if Qodana picks them up
2023-02-22 17:12:51 +01:00
James Cole
26ab65c5aa Various code cleanup, see if Qodana picks them up 2023-02-22 17:11:59 +01:00
James Cole
68f398f97c Merge pull request #7062 from firefly-iii/JC5-patch-1
Update session.php
2023-02-20 12:46:36 +01:00
James Cole
eb04b11c30 Update session.php
Signed-off-by: James Cole <james@firefly-iii.org>
2023-02-20 12:46:21 +01:00
James Cole
29ff1648e2 Merge pull request #7061 from firefly-iii/dependabot/composer/develop/nunomaduro/collision-7.0.5
Bump nunomaduro/collision from 7.0.3 to 7.0.5
2023-02-20 06:25:13 +01:00
dependabot[bot]
13a1e45fc5 Bump nunomaduro/collision from 7.0.3 to 7.0.5
Bumps [nunomaduro/collision](https://github.com/nunomaduro/collision) from 7.0.3 to 7.0.5.
- [Release notes](https://github.com/nunomaduro/collision/releases)
- [Changelog](https://github.com/nunomaduro/collision/blob/v7.x/CHANGELOG.md)
- [Commits](https://github.com/nunomaduro/collision/compare/v7.0.3...v7.0.5)

---
updated-dependencies:
- dependency-name: nunomaduro/collision
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-20 03:56:32 +00:00
James Cole
2ac3e130ec Merge tag 'v6.0.0-beta.2' into develop
v6.0.0-beta.2
2023-02-19 11:32:49 +01:00
752 changed files with 11038 additions and 8190 deletions

View File

@@ -22,12 +22,12 @@
$current = __DIR__;
$paths = [
$current . '/../../app',
$current . '/../../config',
$current . '/../../database',
$current . '/../../routes',
$current . '/../../tests',
$current . '/../../resources/lang',
$current.'/../../app',
$current.'/../../config',
$current.'/../../database',
$current.'/../../routes',
$current.'/../../tests',
$current.'/../../resources/lang',
];
$finder = PhpCsFixer\Finder::create()
@@ -36,9 +36,9 @@ $finder = PhpCsFixer\Finder::create()
$config = new PhpCsFixer\Config();
return $config->setRules([
'@PSR12' => true,
'strict_param' => true,
'array_syntax' => ['syntax' => 'short'],
'@PSR12' => true,
'declare_strict_types' => true,
'strict_param' => true,
'array_syntax' => ['syntax' => 'short'],
])
->setFinder($finder)
;
->setFinder($finder);

View File

@@ -379,16 +379,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
"version": "v3.14.4",
"version": "v3.16.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
"reference": "1b3d9dba63d93b8a202c31e824748218781eae6b"
"reference": "d40f9436e1c448d309fa995ab9c14c5c7a96f2dc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/1b3d9dba63d93b8a202c31e824748218781eae6b",
"reference": "1b3d9dba63d93b8a202c31e824748218781eae6b",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d40f9436e1c448d309fa995ab9c14c5c7a96f2dc",
"reference": "d40f9436e1c448d309fa995ab9c14c5c7a96f2dc",
"shasum": ""
},
"require": {
@@ -455,9 +455,15 @@
}
],
"description": "A tool to automatically fix PHP code style",
"keywords": [
"Static code analysis",
"fixer",
"standards",
"static analysis"
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.14.4"
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.16.0"
},
"funding": [
{
@@ -465,7 +471,7 @@
"type": "github"
}
],
"time": "2023-02-09T21:49:13+00:00"
"time": "2023-04-02T19:30:06+00:00"
},
{
"name": "psr/cache",
@@ -671,16 +677,16 @@
},
{
"name": "sebastian/diff",
"version": "5.0.0",
"version": "5.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
"reference": "70dd1b20bc198da394ad542e988381b44e64e39f"
"reference": "aae9a0a43bff37bd5d8d0311426c87bf36153f02"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/70dd1b20bc198da394ad542e988381b44e64e39f",
"reference": "70dd1b20bc198da394ad542e988381b44e64e39f",
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/aae9a0a43bff37bd5d8d0311426c87bf36153f02",
"reference": "aae9a0a43bff37bd5d8d0311426c87bf36153f02",
"shasum": ""
},
"require": {
@@ -725,7 +731,8 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/diff/issues",
"source": "https://github.com/sebastianbergmann/diff/tree/5.0.0"
"security": "https://github.com/sebastianbergmann/diff/security/policy",
"source": "https://github.com/sebastianbergmann/diff/tree/5.0.1"
},
"funding": [
{
@@ -733,20 +740,20 @@
"type": "github"
}
],
"time": "2023-02-03T07:00:31+00:00"
"time": "2023-03-23T05:12:41+00:00"
},
{
"name": "symfony/console",
"version": "v6.2.5",
"version": "v6.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "3e294254f2191762c1d137aed4b94e966965e985"
"reference": "3582d68a64a86ec25240aaa521ec8bc2342b369b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/3e294254f2191762c1d137aed4b94e966965e985",
"reference": "3e294254f2191762c1d137aed4b94e966965e985",
"url": "https://api.github.com/repos/symfony/console/zipball/3582d68a64a86ec25240aaa521ec8bc2342b369b",
"reference": "3582d68a64a86ec25240aaa521ec8bc2342b369b",
"shasum": ""
},
"require": {
@@ -808,12 +815,12 @@
"homepage": "https://symfony.com",
"keywords": [
"cli",
"command line",
"command-line",
"console",
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v6.2.5"
"source": "https://github.com/symfony/console/tree/v6.2.8"
},
"funding": [
{
@@ -829,20 +836,20 @@
"type": "tidelift"
}
],
"time": "2023-01-01T08:38:09+00:00"
"time": "2023-03-29T21:42:15+00:00"
},
{
"name": "symfony/deprecation-contracts",
"version": "v3.2.0",
"version": "v3.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
"reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3"
"reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3",
"reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e",
"reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e",
"shasum": ""
},
"require": {
@@ -880,7 +887,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0"
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.1"
},
"funding": [
{
@@ -896,20 +903,20 @@
"type": "tidelift"
}
],
"time": "2022-11-25T10:21:52+00:00"
"time": "2023-03-01T10:25:55+00:00"
},
{
"name": "symfony/event-dispatcher",
"version": "v6.2.5",
"version": "v6.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "f02d108b5e9fd4a6245aa73a9d2df2ec060c3e68"
"reference": "04046f35fd7d72f9646e721fc2ecb8f9c67d3339"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f02d108b5e9fd4a6245aa73a9d2df2ec060c3e68",
"reference": "f02d108b5e9fd4a6245aa73a9d2df2ec060c3e68",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/04046f35fd7d72f9646e721fc2ecb8f9c67d3339",
"reference": "04046f35fd7d72f9646e721fc2ecb8f9c67d3339",
"shasum": ""
},
"require": {
@@ -963,7 +970,7 @@
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/event-dispatcher/tree/v6.2.5"
"source": "https://github.com/symfony/event-dispatcher/tree/v6.2.8"
},
"funding": [
{
@@ -979,20 +986,20 @@
"type": "tidelift"
}
],
"time": "2023-01-01T08:38:09+00:00"
"time": "2023-03-20T16:06:02+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
"version": "v3.2.0",
"version": "v3.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
"reference": "0782b0b52a737a05b4383d0df35a474303cabdae"
"reference": "0ad3b6f1e4e2da5690fefe075cd53a238646d8dd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0782b0b52a737a05b4383d0df35a474303cabdae",
"reference": "0782b0b52a737a05b4383d0df35a474303cabdae",
"url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ad3b6f1e4e2da5690fefe075cd53a238646d8dd",
"reference": "0ad3b6f1e4e2da5690fefe075cd53a238646d8dd",
"shasum": ""
},
"require": {
@@ -1042,7 +1049,7 @@
"standards"
],
"support": {
"source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.2.0"
"source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.2.1"
},
"funding": [
{
@@ -1058,20 +1065,20 @@
"type": "tidelift"
}
],
"time": "2022-11-25T10:21:52+00:00"
"time": "2023-03-01T10:32:47+00:00"
},
{
"name": "symfony/filesystem",
"version": "v6.2.5",
"version": "v6.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "e59e8a4006afd7f5654786a83b4fcb8da98f4593"
"reference": "82b6c62b959f642d000456f08c6d219d749215b3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/e59e8a4006afd7f5654786a83b4fcb8da98f4593",
"reference": "e59e8a4006afd7f5654786a83b4fcb8da98f4593",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/82b6c62b959f642d000456f08c6d219d749215b3",
"reference": "82b6c62b959f642d000456f08c6d219d749215b3",
"shasum": ""
},
"require": {
@@ -1105,7 +1112,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/filesystem/tree/v6.2.5"
"source": "https://github.com/symfony/filesystem/tree/v6.2.7"
},
"funding": [
{
@@ -1121,20 +1128,20 @@
"type": "tidelift"
}
],
"time": "2023-01-20T17:45:48+00:00"
"time": "2023-02-14T08:44:56+00:00"
},
{
"name": "symfony/finder",
"version": "v6.2.5",
"version": "v6.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "c90dc446976a612e3312a97a6ec0069ab0c2099c"
"reference": "20808dc6631aecafbe67c186af5dcb370be3a0eb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/c90dc446976a612e3312a97a6ec0069ab0c2099c",
"reference": "c90dc446976a612e3312a97a6ec0069ab0c2099c",
"url": "https://api.github.com/repos/symfony/finder/zipball/20808dc6631aecafbe67c186af5dcb370be3a0eb",
"reference": "20808dc6631aecafbe67c186af5dcb370be3a0eb",
"shasum": ""
},
"require": {
@@ -1169,7 +1176,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/finder/tree/v6.2.5"
"source": "https://github.com/symfony/finder/tree/v6.2.7"
},
"funding": [
{
@@ -1185,20 +1192,20 @@
"type": "tidelift"
}
],
"time": "2023-01-20T17:45:48+00:00"
"time": "2023-02-16T09:57:23+00:00"
},
{
"name": "symfony/options-resolver",
"version": "v6.2.5",
"version": "v6.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
"reference": "e8324d44f5af99ec2ccec849934a242f64458f86"
"reference": "aa0e85b53bbb2b4951960efd61d295907eacd629"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/e8324d44f5af99ec2ccec849934a242f64458f86",
"reference": "e8324d44f5af99ec2ccec849934a242f64458f86",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/aa0e85b53bbb2b4951960efd61d295907eacd629",
"reference": "aa0e85b53bbb2b4951960efd61d295907eacd629",
"shasum": ""
},
"require": {
@@ -1236,7 +1243,7 @@
"options"
],
"support": {
"source": "https://github.com/symfony/options-resolver/tree/v6.2.5"
"source": "https://github.com/symfony/options-resolver/tree/v6.2.7"
},
"funding": [
{
@@ -1252,7 +1259,7 @@
"type": "tidelift"
}
],
"time": "2023-01-01T08:38:09+00:00"
"time": "2023-02-14T08:44:56+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -1748,16 +1755,16 @@
},
{
"name": "symfony/process",
"version": "v6.2.5",
"version": "v6.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "9ead139f63dfa38c4e4a9049cc64a8b2748c83b7"
"reference": "75ed64103df4f6615e15a7fe38b8111099f47416"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/9ead139f63dfa38c4e4a9049cc64a8b2748c83b7",
"reference": "9ead139f63dfa38c4e4a9049cc64a8b2748c83b7",
"url": "https://api.github.com/repos/symfony/process/zipball/75ed64103df4f6615e15a7fe38b8111099f47416",
"reference": "75ed64103df4f6615e15a7fe38b8111099f47416",
"shasum": ""
},
"require": {
@@ -1789,7 +1796,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/process/tree/v6.2.5"
"source": "https://github.com/symfony/process/tree/v6.2.8"
},
"funding": [
{
@@ -1805,20 +1812,20 @@
"type": "tidelift"
}
],
"time": "2023-01-01T08:38:09+00:00"
"time": "2023-03-09T16:20:02+00:00"
},
{
"name": "symfony/service-contracts",
"version": "v3.2.0",
"version": "v3.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
"reference": "aac98028c69df04ee77eb69b96b86ee51fbf4b75"
"reference": "a8c9cedf55f314f3a186041d19537303766df09a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/aac98028c69df04ee77eb69b96b86ee51fbf4b75",
"reference": "aac98028c69df04ee77eb69b96b86ee51fbf4b75",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/a8c9cedf55f314f3a186041d19537303766df09a",
"reference": "a8c9cedf55f314f3a186041d19537303766df09a",
"shasum": ""
},
"require": {
@@ -1874,7 +1881,7 @@
"standards"
],
"support": {
"source": "https://github.com/symfony/service-contracts/tree/v3.2.0"
"source": "https://github.com/symfony/service-contracts/tree/v3.2.1"
},
"funding": [
{
@@ -1890,20 +1897,20 @@
"type": "tidelift"
}
],
"time": "2022-11-25T10:21:52+00:00"
"time": "2023-03-01T10:32:47+00:00"
},
{
"name": "symfony/stopwatch",
"version": "v6.2.5",
"version": "v6.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
"reference": "00b6ac156aacffc53487c930e0ab14587a6607f6"
"reference": "f3adc98c1061875dd2edcd45e5b04e63d0e29f8f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/00b6ac156aacffc53487c930e0ab14587a6607f6",
"reference": "00b6ac156aacffc53487c930e0ab14587a6607f6",
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/f3adc98c1061875dd2edcd45e5b04e63d0e29f8f",
"reference": "f3adc98c1061875dd2edcd45e5b04e63d0e29f8f",
"shasum": ""
},
"require": {
@@ -1936,7 +1943,7 @@
"description": "Provides a way to profile code",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/stopwatch/tree/v6.2.5"
"source": "https://github.com/symfony/stopwatch/tree/v6.2.7"
},
"funding": [
{
@@ -1952,20 +1959,20 @@
"type": "tidelift"
}
],
"time": "2023-01-01T08:36:55+00:00"
"time": "2023-02-14T08:44:56+00:00"
},
{
"name": "symfony/string",
"version": "v6.2.5",
"version": "v6.2.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "b2dac0fa27b1ac0f9c0c0b23b43977f12308d0b0"
"reference": "193e83bbd6617d6b2151c37fff10fa7168ebddef"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/b2dac0fa27b1ac0f9c0c0b23b43977f12308d0b0",
"reference": "b2dac0fa27b1ac0f9c0c0b23b43977f12308d0b0",
"url": "https://api.github.com/repos/symfony/string/zipball/193e83bbd6617d6b2151c37fff10fa7168ebddef",
"reference": "193e83bbd6617d6b2151c37fff10fa7168ebddef",
"shasum": ""
},
"require": {
@@ -2022,7 +2029,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v6.2.5"
"source": "https://github.com/symfony/string/tree/v6.2.8"
},
"funding": [
{
@@ -2038,7 +2045,7 @@
"type": "tidelift"
}
],
"time": "2023-01-01T08:38:09+00:00"
"time": "2023-03-20T16:06:02+00:00"
}
],
"packages-dev": [],

View File

@@ -31,6 +31,7 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
# clean up php code
cd $SCRIPT_DIR/php-cs-fixer
composer update
rm -f .php-cs-fixer.cache
PHP_CS_FIXER_IGNORE_ENV=true ./vendor/bin/php-cs-fixer fix --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php --allow-risky=yes
cd $SCRIPT_DIR/..

View File

@@ -16,7 +16,7 @@ body:
options:
- label: ... [the documentation](https://docs.firefly-iii.org/) does not mention anything about my problem
- label: ... there are no open or closed issues that are related to my problem
- label: ... it's [definitely me, not you](https://github.com/firefly-iii/firefly-iii/blob/main/.github/its_you_not_me.md)
- label: ... it's [definitely a Firefly III issue, not me](https://github.com/firefly-iii/firefly-iii/blob/main/.github/its_you_not_me.md)
- type: textarea
attributes:
@@ -27,18 +27,18 @@ body:
- type: textarea
attributes:
label: Expected behaviour
description: Please describe precisely what you'd expect to happen.
label: Debug information
description: Please provide the table from the /debug page. Do not add backticks or quotes.
placeholder: The output from the /debug page
validations:
required: true
- type: textarea
attributes:
label: Debug information
description: Please provide the table from the /debug page
placeholder: The output from the /debug page
label: Expected behaviour
description: Please describe precisely what you'd expect to happen. Be specific.
validations:
required: true
required: false
- type: textarea
attributes:

View File

@@ -8,9 +8,9 @@ body:
options:
- label: I've read the [support guidelines](https://github.com/firefly-iii/firefly-iii/blob/main/.github/support.md)
required: true
- label: My request is not listed as [a very good idea, but unfortunately...](https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/what-its-not/)
- label: My request is not listed as [a very good idea, but unfortunately...](https://docs.firefly-iii.org/firefly-iii/more-information/what-its-not/)
required: true
- label: I've used [the search](https://github.com/firefly-iii/firefly-iii/issues?q=is%3Aissue) and this has not been discussed before.
- label: I've used [the search](https://github.com/firefly-iii/firefly-iii/issues?q=is%3Aissue) and this has not been requested before.
required: true
- type: textarea
@@ -18,9 +18,9 @@ body:
label: Description
description: Please describe your feature request
placeholder: |
- I would like Firefly III to do ABC.
- What if you would add feature XYZ?
- Firefly III doesn't do DEF.
- I would like Firefly III to do (thing).
- What if you would add feature (feature here)?
- Firefly III doesn't do (thing).
validations:
required: true

View File

@@ -1,16 +0,0 @@
name: Sonarcloud CI
on:
workflow_dispatch:
jobs:
sonarcloud:
name: SonarCloud
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: SonarCloud Scan
uses: SonarSource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

View File

@@ -12,18 +12,18 @@ jobs:
timeout-minutes: 10
steps:
- name: Prune cancelled/skipped runs
uses: actions/github-script@v4
uses: actions/github-script@v6
with:
github-token: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }}
script: |
const cancelled = await github.actions.listWorkflowRunsForRepo({
const cancelled = await github.rest.actions.listWorkflowRunsForRepo({
owner: context.repo.owner,
per_page: 100,
repo: context.repo.repo,
status: 'cancelled',
});
const skipped = await github.actions.listWorkflowRunsForRepo({
const skipped = await github.rest.actions.listWorkflowRunsForRepo({
owner: context.repo.owner,
per_page: 100,
repo: context.repo.repo,
@@ -33,7 +33,7 @@ jobs:
for (const response of [cancelled, skipped]) {
for (const run of response.data.workflow_runs) {
console.log(`Run id ${run.id} of '${run.name}' is a cancelled/skipped run. Deleting...`);
await github.actions.deleteWorkflowRun({
await github.rest.actions.deleteWorkflowRun({
owner: context.repo.owner,
repo: context.repo.repo,
run_id: run.id
@@ -42,7 +42,7 @@ jobs:
}
- name: Prune runs older than 3 days
uses: actions/github-script@v4
uses: actions/github-script@v6
with:
github-token: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }}
script: |
@@ -55,7 +55,6 @@ jobs:
// because we track the duration of runs over time
const workflows = [
'build.yml',
'cleanup.yml',
'depsreview.yaml',
'laravel.yml',
@@ -67,7 +66,7 @@ jobs:
for (const workflow of workflows) {
for (let page = 0; page < pages; page += 1) {
let response = await github.actions.listWorkflowRuns({
let response = await github.rest.actions.listWorkflowRuns({
owner: context.repo.owner,
page: page,
per_page: 100,
@@ -88,7 +87,7 @@ jobs:
for (const run of runs_to_delete) {
console.log(`Run id ${run[0]} of '${run[1]}' is older than ${days_to_expiration} days. Deleting...`);
try {
await github.actions.deleteWorkflowRun({
await github.rest.actions.deleteWorkflowRun({
owner: context.repo.owner,
repo: context.repo.repo,
run_id: run[0]

View File

@@ -58,7 +58,6 @@ class TransactionTypeController extends Controller
* @param AutocompleteRequest $request
*
* @return JsonResponse
*/
public function transactionTypes(AutocompleteRequest $request): JsonResponse
{

View File

@@ -94,19 +94,39 @@ class DestroyController extends Controller
case 'object_groups':
$this->destroyObjectGroups();
break;
case 'not_assets_liabilities':
$this->destroyAccounts(
[
AccountType::BENEFICIARY,
AccountType::CASH,
AccountType::CREDITCARD,
AccountType::DEFAULT,
AccountType::EXPENSE,
AccountType::IMPORT,
AccountType::INITIAL_BALANCE,
AccountType::LIABILITY_CREDIT,
AccountType::RECONCILIATION,
AccountType::REVENUE,
]
);
break;
case 'accounts':
$this->destroyAccounts(
[
AccountType::ASSET,
AccountType::DEFAULT,
AccountType::BENEFICIARY,
AccountType::EXPENSE,
AccountType::REVENUE,
AccountType::INITIAL_BALANCE,
AccountType::CASH,
AccountType::CREDITCARD,
AccountType::DEBT,
AccountType::DEFAULT,
AccountType::EXPENSE,
AccountType::IMPORT,
AccountType::INITIAL_BALANCE,
AccountType::LIABILITY_CREDIT,
AccountType::LOAN,
AccountType::MORTGAGE,
AccountType::CREDITCARD,
AccountType::RECONCILIATION,
AccountType::REVENUE,
]
);
break;

View File

@@ -63,7 +63,6 @@ class DestroyController extends Controller
*
* @param Account $account
*
* @return JsonResponse
*/
public function destroy(Account $account): JsonResponse

View File

@@ -76,7 +76,6 @@ class ListController extends Controller
* @param Account $account
*
* @return JsonResponse
* @throws FireflyException
*/
public function attachments(Account $account): JsonResponse
@@ -110,7 +109,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function piggyBanks(Account $account): JsonResponse
{
@@ -145,7 +143,6 @@ class ListController extends Controller
*
* Show all transaction groups related to the account.
*
*
* @param Request $request
* @param Account $account

View File

@@ -75,7 +75,6 @@ class ShowController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(Request $request): JsonResponse
{

View File

@@ -30,7 +30,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Transformers\AccountTransformer;
use Illuminate\Http\JsonResponse;
use League\Fractal\Resource\Item;
use Log;
use Illuminate\Support\Facades\Log;
use Preferences;
/**

View File

@@ -64,7 +64,6 @@ class DestroyController extends Controller
*
* Remove the specified resource from storage.
*
*
* @param Attachment $attachment
*

View File

@@ -73,7 +73,6 @@ class ShowController extends Controller
*
* @param Attachment $attachment
*
* @return LaravelResponse
* @throws FireflyException
*/
@@ -118,7 +117,6 @@ class ShowController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(): JsonResponse
{

View File

@@ -35,7 +35,7 @@ use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use League\Fractal\Resource\Item;
use Log;
use Illuminate\Support\Facades\Log;
/**
* Class StoreController
@@ -95,7 +95,6 @@ class StoreController extends Controller
/**
* Upload an attachment.
*
*
* @param Request $request
* @param Attachment $attachment

View File

@@ -70,7 +70,6 @@ class ShowController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(): JsonResponse
{
@@ -110,7 +109,6 @@ class ShowController extends Controller
* @param AvailableBudget $availableBudget
*
* @return JsonResponse
*/
public function show(AvailableBudget $availableBudget): JsonResponse
{

View File

@@ -62,7 +62,6 @@ class DestroyController extends Controller
* @param Bill $bill
*
* @return JsonResponse
*/
public function destroy(Bill $bill): JsonResponse
{

View File

@@ -76,7 +76,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function attachments(Bill $bill): JsonResponse
{
@@ -111,7 +110,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function rules(Bill $bill): JsonResponse
{
@@ -150,7 +148,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function transactions(Request $request, Bill $bill): JsonResponse
{

View File

@@ -67,7 +67,6 @@ class ShowController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(): JsonResponse
{
@@ -98,7 +97,6 @@ class ShowController extends Controller
* @param Bill $bill
*
* @return JsonResponse
*/
public function show(Bill $bill): JsonResponse
{

View File

@@ -62,7 +62,6 @@ class DestroyController extends Controller
* @param Budget $budget
*
* @return JsonResponse
*/
public function destroy(Budget $budget): JsonResponse
{

View File

@@ -78,7 +78,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function attachments(Budget $budget): JsonResponse
{
@@ -113,7 +112,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function budgetLimits(Budget $budget): JsonResponse
{
@@ -147,7 +145,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function transactions(Request $request, Budget $budget): JsonResponse
{
@@ -211,7 +208,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function withoutBudget(Request $request): JsonResponse
{

View File

@@ -71,7 +71,6 @@ class ShowController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(): JsonResponse
{
@@ -105,7 +104,6 @@ class ShowController extends Controller
* @param Budget $budget
*
* @return JsonResponse
*/
public function show(Budget $budget): JsonResponse
{

View File

@@ -69,7 +69,6 @@ class DestroyController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function destroy(Budget $budget, BudgetLimit $budgetLimit): JsonResponse
{

View File

@@ -77,7 +77,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
{

View File

@@ -24,7 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Data\DateRequest;
use FireflyIII\Api\V1\Requests\Data\SameDateRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Budget;
use FireflyIII\Models\BudgetLimit;
@@ -80,7 +80,6 @@ class ShowController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(Request $request, Budget $budget): JsonResponse
{
@@ -109,13 +108,12 @@ class ShowController extends Controller
*
* Display a listing of the budget limits for this budget.
*
* @param DateRequest $request
* @param SameDateRequest $request
*
* @return JsonResponse
* @throws FireflyException
*/
public function indexAll(DateRequest $request): JsonResponse
public function indexAll(SameDateRequest $request): JsonResponse
{
$manager = $this->getManager();
$manager->parseIncludes('budget');

View File

@@ -62,7 +62,6 @@ class DestroyController extends Controller
* @param Category $category
*
* @return JsonResponse
*/
public function destroy(Category $category): JsonResponse
{

View File

@@ -73,7 +73,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function attachments(Category $category): JsonResponse
{
@@ -110,7 +109,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function transactions(Request $request, Category $category): JsonResponse
{

View File

@@ -67,7 +67,6 @@ class ShowController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(): JsonResponse
{
@@ -103,7 +102,6 @@ class ShowController extends Controller
* @param Category $category
*
* @return JsonResponse
*/
public function show(Category $category): JsonResponse
{

View File

@@ -64,7 +64,6 @@ class DestroyController extends Controller
*
* @param ObjectGroup $objectGroup
*
* @return JsonResponse
*/
public function destroy(ObjectGroup $objectGroup): JsonResponse

View File

@@ -72,7 +72,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function bills(ObjectGroup $objectGroup): JsonResponse
{
@@ -108,7 +107,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function piggyBanks(ObjectGroup $objectGroup): JsonResponse
{

View File

@@ -73,7 +73,6 @@ class ShowController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(Request $request): JsonResponse
{

View File

@@ -62,7 +62,6 @@ class DestroyController extends Controller
* @param PiggyBank $piggyBank
*
* @return JsonResponse
*/
public function destroy(PiggyBank $piggyBank): JsonResponse
{

View File

@@ -67,7 +67,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function attachments(PiggyBank $piggyBank): JsonResponse
{
@@ -102,7 +101,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse
{

View File

@@ -67,7 +67,6 @@ class ShowController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(): JsonResponse
{
@@ -103,7 +102,6 @@ class ShowController extends Controller
* @param PiggyBank $piggyBank
*
* @return JsonResponse
*/
public function show(PiggyBank $piggyBank): JsonResponse
{

View File

@@ -62,7 +62,6 @@ class DestroyController extends Controller
* @param Recurrence $recurrence
*
* @return JsonResponse
*/
public function destroy(Recurrence $recurrence): JsonResponse
{

View File

@@ -74,7 +74,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function transactions(Request $request, Recurrence $recurrence): JsonResponse
{

View File

@@ -67,7 +67,6 @@ class ShowController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(): JsonResponse
{
@@ -104,7 +103,6 @@ class ShowController extends Controller
* @param Recurrence $recurrence
*
* @return JsonResponse
*/
public function show(Recurrence $recurrence): JsonResponse
{

View File

@@ -66,7 +66,6 @@ class DestroyController extends Controller
* @param Rule $rule
*
* @return JsonResponse
*/
public function destroy(Rule $rule): JsonResponse
{

View File

@@ -71,7 +71,6 @@ class ShowController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(): JsonResponse
{
@@ -108,7 +107,6 @@ class ShowController extends Controller
* @param Rule $rule
*
* @return JsonResponse
*/
public function show(Rule $rule): JsonResponse
{

View File

@@ -66,7 +66,6 @@ class DestroyController extends Controller
* @param RuleGroup $ruleGroup
*
* @return JsonResponse
*/
public function destroy(RuleGroup $ruleGroup): JsonResponse
{

View File

@@ -70,7 +70,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function rules(RuleGroup $group): JsonResponse
{

View File

@@ -70,7 +70,6 @@ class ShowController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(): JsonResponse
{
@@ -106,7 +105,6 @@ class ShowController extends Controller
* @param RuleGroup $ruleGroup
*
* @return JsonResponse
*/
public function show(RuleGroup $ruleGroup): JsonResponse
{

View File

@@ -66,7 +66,6 @@ class DestroyController extends Controller
* @param Tag $tag
*
* @return JsonResponse
*/
public function destroy(Tag $tag): JsonResponse
{

View File

@@ -76,7 +76,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function attachments(Tag $tag): JsonResponse
{
@@ -112,7 +111,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function transactions(Request $request, Tag $tag): JsonResponse
{

View File

@@ -71,7 +71,6 @@ class ShowController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(): JsonResponse
{
@@ -107,7 +106,6 @@ class ShowController extends Controller
* @param Tag $tag
*
* @return JsonResponse
*/
public function show(Tag $tag): JsonResponse
{

View File

@@ -33,7 +33,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepository;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Log;
use Illuminate\Support\Facades\Log;
/**
* Class DestroyController
@@ -76,7 +76,6 @@ class DestroyController extends Controller
* @param TransactionGroup $transactionGroup
*
* @return JsonResponse
*/
public function destroy(TransactionGroup $transactionGroup): JsonResponse
{
@@ -116,7 +115,6 @@ class DestroyController extends Controller
*
* @param TransactionJournal $transactionJournal
*
* @return JsonResponse
*/
public function destroyJournal(TransactionJournal $transactionJournal): JsonResponse

View File

@@ -74,7 +74,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function attachments(TransactionGroup $transactionGroup): JsonResponse
{
@@ -110,7 +109,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function piggyBankEvents(TransactionGroup $transactionGroup): JsonResponse
{
@@ -149,7 +147,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function transactionLinks(TransactionJournal $transactionJournal): JsonResponse
{

View File

@@ -55,7 +55,6 @@ class ShowController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(Request $request): JsonResponse
{
@@ -107,7 +106,6 @@ class ShowController extends Controller
* @param TransactionJournal $transactionJournal
*
* @return JsonResponse
*/
public function showJournal(TransactionJournal $transactionJournal): JsonResponse
{
@@ -123,7 +121,6 @@ class ShowController extends Controller
* @param TransactionGroup $transactionGroup
*
* @return JsonResponse
*/
public function show(TransactionGroup $transactionGroup): JsonResponse
{

View File

@@ -37,7 +37,7 @@ use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Validation\ValidationException;
use League\Fractal\Resource\Item;
use Log;
use Illuminate\Support\Facades\Log;
use Validator;
/**

View File

@@ -33,7 +33,7 @@ use FireflyIII\Transformers\TransactionGroupTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use League\Fractal\Resource\Item;
use Log;
use Illuminate\Support\Facades\Log;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**

View File

@@ -39,7 +39,7 @@ use Validator;
class DestroyController extends Controller
{
private CurrencyRepositoryInterface $repository;
private UserRepositoryInterface $userRepository;
private UserRepositoryInterface $userRepository;
/**
* CurrencyRepository constructor.
@@ -51,7 +51,7 @@ class DestroyController extends Controller
parent::__construct();
$this->middleware(
function ($request, $next) {
$this->repository = app(CurrencyRepositoryInterface::class);
$this->repository = app(CurrencyRepositoryInterface::class);
$this->userRepository = app(UserRepositoryInterface::class);
$this->repository->setUser(auth()->user());
@@ -70,7 +70,6 @@ class DestroyController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function destroy(TransactionCurrency $currency): JsonResponse
{

View File

@@ -41,7 +41,6 @@ use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Http\Api\AccountFilter;
use FireflyIII\Support\Http\Api\TransactionFilter;
use FireflyIII\Transformers\AccountTransformer;
@@ -67,6 +66,7 @@ class ListController extends Controller
use TransactionFilter;
private CurrencyRepositoryInterface $repository;
/**
* CurrencyRepository constructor.
*
@@ -77,7 +77,7 @@ class ListController extends Controller
parent::__construct();
$this->middleware(
function ($request, $next) {
$this->repository = app(CurrencyRepositoryInterface::class);
$this->repository = app(CurrencyRepositoryInterface::class);
$this->repository->setUser(auth()->user());
return $next($request);
@@ -95,7 +95,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function accounts(Request $request, TransactionCurrency $currency): JsonResponse
{
@@ -149,7 +148,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function availableBudgets(TransactionCurrency $currency): JsonResponse
{
@@ -188,7 +186,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function bills(TransactionCurrency $currency): JsonResponse
{
@@ -232,7 +229,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function budgetLimits(TransactionCurrency $currency): JsonResponse
{
@@ -267,7 +263,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function recurrences(TransactionCurrency $currency): JsonResponse
{
@@ -320,7 +315,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function rules(TransactionCurrency $currency): JsonResponse
{
@@ -374,7 +368,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function transactions(Request $request, TransactionCurrency $currency): JsonResponse
{

View File

@@ -75,7 +75,6 @@ class ShowController extends Controller
* @return JsonResponse
* @throws FireflyException
* @throws JsonException
*/
public function index(): JsonResponse
{
@@ -111,7 +110,6 @@ class ShowController extends Controller
* @return JsonResponse
* @throws FireflyException
* @throws JsonException
*/
public function show(TransactionCurrency $currency): JsonResponse
{
@@ -137,7 +135,6 @@ class ShowController extends Controller
* @return JsonResponse
* @throws FireflyException
* @throws JsonException
*/
public function showDefault(): JsonResponse
{

View File

@@ -29,7 +29,6 @@ use FireflyIII\Api\V1\Requests\Models\TransactionCurrency\UpdateRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Http\Api\AccountFilter;
use FireflyIII\Support\Http\Api\TransactionFilter;
use FireflyIII\Transformers\CurrencyTransformer;
@@ -76,7 +75,6 @@ class UpdateController extends Controller
* @return JsonResponse
* @throws FireflyException
* @throws JsonException
*/
public function disable(TransactionCurrency $currency): JsonResponse
{
@@ -109,7 +107,6 @@ class UpdateController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function makeDefault(TransactionCurrency $currency): JsonResponse
{
@@ -142,7 +139,6 @@ class UpdateController extends Controller
* @return JsonResponse
* @throws FireflyException
* @throws JsonException
*/
public function enable(TransactionCurrency $currency): JsonResponse
{

View File

@@ -65,7 +65,6 @@ class DestroyController extends Controller
* @param TransactionJournalLink $link
*
* @return JsonResponse
*/
public function destroy(TransactionJournalLink $link): JsonResponse
{

View File

@@ -73,7 +73,6 @@ class ShowController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(Request $request): JsonResponse
{
@@ -114,7 +113,6 @@ class ShowController extends Controller
* @param TransactionJournalLink $journalLink
*
* @return JsonResponse
*/
public function show(TransactionJournalLink $journalLink): JsonResponse
{

View File

@@ -29,7 +29,6 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\LinkType;
use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Http\Api\TransactionFilter;
use FireflyIII\Transformers\TransactionGroupTransformer;
use FireflyIII\User;
@@ -58,8 +57,8 @@ class ListController extends Controller
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$this->repository = app(LinkTypeRepositoryInterface::class);
$user = auth()->user();
$this->repository = app(LinkTypeRepositoryInterface::class);
$this->repository->setUser($user);
return $next($request);
@@ -76,7 +75,6 @@ class ListController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function transactions(Request $request, LinkType $linkType): JsonResponse
{

View File

@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\LinkType;
use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Http\Api\TransactionFilter;
use FireflyIII\Transformers\LinkTypeTransformer;
use FireflyIII\User;
@@ -58,8 +57,8 @@ class ShowController extends Controller
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$this->repository = app(LinkTypeRepositoryInterface::class);
$user = auth()->user();
$this->repository = app(LinkTypeRepositoryInterface::class);
$this->repository->setUser($user);
return $next($request);
@@ -74,7 +73,6 @@ class ShowController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(): JsonResponse
{
@@ -110,7 +108,6 @@ class ShowController extends Controller
* @param LinkType $linkType
*
* @return JsonResponse
*/
public function show(LinkType $linkType): JsonResponse
{

View File

@@ -35,7 +35,7 @@ use Illuminate\Pagination\LengthAwarePaginator;
use JsonException;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use Log;
use Illuminate\Support\Facades\Log;
/**
* Class AccountController

View File

@@ -360,7 +360,9 @@ class BasicController extends Controller
/** @var NetWorthInterface $netWorthHelper */
$netWorthHelper = app(NetWorthInterface::class);
$netWorthHelper->setUser($user);
$allAccounts = $this->accountRepository->getActiveAccountsByType([AccountType::ASSET, AccountType::DEFAULT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::DEBT]);
$allAccounts = $this->accountRepository->getActiveAccountsByType(
[AccountType::ASSET, AccountType::DEFAULT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::DEBT]
);
// filter list on preference of being included.
$filtered = $allAccounts->filter(

View File

@@ -33,7 +33,6 @@ use League\Fractal\Resource\Item;
/**
* Returns basic information about this installation.
*
* Class AboutController.
*/
class AboutController extends Controller

View File

@@ -29,7 +29,7 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Binder\EitherConfigKey;
use Illuminate\Http\JsonResponse;
use Log;
use Illuminate\Support\Facades\Log;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Validator;
@@ -61,7 +61,9 @@ class ConfigurationController extends Controller
* https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/configuration/getConfiguration
*
* @return JsonResponse
* @throws ContainerExceptionInterface
* @throws FireflyException
* @throws NotFoundExceptionInterface
*/
public function index(): JsonResponse
{
@@ -96,7 +98,6 @@ class ConfigurationController extends Controller
* Get all config values.
*
* @return array
* @throws FireflyException
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
@@ -136,7 +137,9 @@ class ConfigurationController extends Controller
* @param string $configKey
*
* @return JsonResponse
* @throws ContainerExceptionInterface
* @throws FireflyException
* @throws NotFoundExceptionInterface
*/
public function show(string $configKey): JsonResponse
{
@@ -171,7 +174,9 @@ class ConfigurationController extends Controller
* @param string $name
*
* @return JsonResponse
* @throws ContainerExceptionInterface
* @throws FireflyException
* @throws NotFoundExceptionInterface
*/
public function update(UpdateRequest $request, string $name): JsonResponse
{

View File

@@ -27,7 +27,7 @@ use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\System\CronRequest;
use FireflyIII\Support\Http\Controllers\CronRunner;
use Illuminate\Http\JsonResponse;
use Log;
use Illuminate\Support\Facades\Log;
/**
* Class CronController

View File

@@ -72,7 +72,6 @@ class UserController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function destroy(User $user): JsonResponse
{
@@ -98,7 +97,6 @@ class UserController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(): JsonResponse
{
@@ -135,7 +133,6 @@ class UserController extends Controller
* @param User $user
*
* @return JsonResponse
*/
public function show(User $user): JsonResponse
{
@@ -191,7 +188,7 @@ class UserController extends Controller
*/
public function update(UserUpdateRequest $request, User $user): JsonResponse
{
$data = $request->getAll();
$data = $request->getAll();
// can only update 'blocked' when user is admin.
if (!$this->repository->hasRole(auth()->user(), 'owner')) {

View File

@@ -52,7 +52,6 @@ class PreferencesController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(): JsonResponse
{
@@ -85,7 +84,6 @@ class PreferencesController extends Controller
* @param Preference $preference
*
* @return JsonResponse
*/
public function show(Preference $preference): JsonResponse
{

View File

@@ -45,7 +45,6 @@ class AttemptController extends Controller
private WebhookRepositoryInterface $repository;
/**
*/
public function __construct()
{

View File

@@ -40,7 +40,6 @@ class DestroyController extends Controller
private WebhookRepositoryInterface $repository;
/**
*/
public function __construct()
{
@@ -64,7 +63,6 @@ class DestroyController extends Controller
* @param Webhook $webhook
*
* @return JsonResponse
*/
public function destroy(Webhook $webhook): JsonResponse
{
@@ -86,7 +84,6 @@ class DestroyController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function destroyAttempt(Webhook $webhook, WebhookMessage $message, WebhookAttempt $attempt): JsonResponse
{
@@ -114,7 +111,6 @@ class DestroyController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function destroyMessage(Webhook $webhook, WebhookMessage $message): JsonResponse
{

View File

@@ -41,7 +41,6 @@ class MessageController extends Controller
private WebhookRepositoryInterface $repository;
/**
*/
public function __construct()
{

View File

@@ -24,9 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Webhook;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Enums\WebhookTrigger;
use FireflyIII\Events\RequestedSendWebhookMessages;
use FireflyIII\Events\StoredTransactionGroup;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Generator\Webhook\MessageGeneratorInterface;
use FireflyIII\Models\TransactionGroup;
@@ -49,7 +47,6 @@ class ShowController extends Controller
private WebhookRepositoryInterface $repository;
/**
*/
public function __construct()
{
@@ -72,7 +69,6 @@ class ShowController extends Controller
*
* @return JsonResponse
* @throws FireflyException
*/
public function index(): JsonResponse
{

View File

@@ -39,7 +39,6 @@ class StoreController extends Controller
private WebhookRepositoryInterface $repository;
/**
*/
public function __construct()
{

View File

@@ -37,7 +37,6 @@ class SubmitController extends Controller
private WebhookRepositoryInterface $repository;
/**
*/
public function __construct()
{
@@ -59,7 +58,6 @@ class SubmitController extends Controller
* @param Webhook $webhook
*
* @return JsonResponse
*/
public function submit(Webhook $webhook): JsonResponse
{

View File

@@ -39,7 +39,6 @@ class UpdateController extends Controller
private WebhookRepositoryInterface $repository;
/**
*/
public function __construct()
{

View File

@@ -32,7 +32,7 @@ use FireflyIII\Validation\Api\Data\Bulk\ValidatesBulkTransactionQuery;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator;
use JsonException;
use Log;
use Illuminate\Support\Facades\Log;
/**
* Class TransactionRequest

View File

@@ -53,7 +53,8 @@ class DestroyRequest extends FormRequest
public function rules(): array
{
$valid = 'budgets,bills,piggy_banks,rules,recurring,categories,tags,object_groups'.
',accounts,asset_accounts,expense_accounts,revenue_accounts,liabilities,transactions,withdrawals,deposits,transfers';
',accounts,asset_accounts,expense_accounts,revenue_accounts,liabilities,transactions,withdrawals,deposits,transfers'.
',not_assets_liabilities';
return [
'objects' => sprintf('required|min:1|string|in:%s', $valid),

View File

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests\Data\Export;
use Carbon\Carbon;
use FireflyIII\Models\AccountType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\Request\ChecksLogin;

View File

@@ -0,0 +1,66 @@
<?php
/*
* DateRequest.php
* Copyright (c) 2021 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests\Data;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
use Illuminate\Foundation\Http\FormRequest;
/**
* Request class for end points that require date parameters.
*
* Class SameDateRequest
*/
class SameDateRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
/**
* Get all data from the request.
*
* @return array
*/
public function getAll(): array
{
return [
'start' => $this->getCarbonDate('start'),
'end' => $this->getCarbonDate('end'),
];
}
/**
* The rules that the incoming request must be matched against.
*
* @return array
*/
public function rules(): array
{
return [
'start' => 'required|date',
'end' => 'required|date|after_or_equal:start',
];
}
}

View File

@@ -83,9 +83,9 @@ class StoreRequest extends FormRequest
$data = $this->appendLocationData($data, null);
if ('liability' === $data['account_type_name'] || 'liabilities' === $data['account_type_name']) {
$data['account_type_name'] = $this->convertString('liability_type');
$data['liability_direction'] = $this->convertString('liability_direction');
$data['account_type_id'] = null;
$data['account_type_name'] = $this->convertString('liability_type');
$data['liability_direction'] = $this->convertString('liability_direction');
$data['account_type_id'] = null;
}
return $data;

View File

@@ -33,7 +33,7 @@ use FireflyIII\Support\Request\AppendsLocationData;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
use Illuminate\Foundation\Http\FormRequest;
use Log;
use Illuminate\Support\Facades\Log;
/**
* Class UpdateRequest
@@ -76,7 +76,7 @@ class UpdateRequest extends FormRequest
'liability_amount' => ['liability_amount', 'convertString'],
'liability_start_date' => ['liability_start_date', 'date'],
];
$data = $this->getAllData($fields);
$data = $this->getAllData($fields);
return $this->appendLocationData($data, null);
}

View File

@@ -29,7 +29,7 @@ use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator;
use Log;
use Illuminate\Support\Facades\Log;
/**
* Class StoreRequest

View File

@@ -76,7 +76,7 @@ class UpdateRequest extends FormRequest
return [
'name' => 'between:1,255|uniquePiggyBankForUser:'.$piggyBank->id,
'current_amount' => ['numeric', 'gte:0', new LessThanPiggyTarget()],
'target_amount' => 'numeric|gt:0',
'target_amount' => 'numeric|gte:0',
'start_date' => 'date|nullable',
'target_date' => 'date|nullable|after:start_date',
'notes' => 'max:65000',

View File

@@ -29,7 +29,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
use Illuminate\Foundation\Http\FormRequest;
/**
* Class StoreRequest
*/
class StoreRequest extends FormRequest

View File

@@ -30,7 +30,6 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
use Illuminate\Foundation\Http\FormRequest;
/**
* Class UpdateRequest
*/
class UpdateRequest extends FormRequest

View File

@@ -36,7 +36,7 @@ use FireflyIII\Validation\GroupValidation;
use FireflyIII\Validation\TransactionValidation;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator;
use Log;
use Illuminate\Support\Facades\Log;
/**
* Class StoreRequest

View File

@@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests\System;
use Carbon\Carbon;
use FireflyIII\Support\Request\ConvertsDataTypes;
use Illuminate\Foundation\Http\FormRequest;

View File

@@ -25,10 +25,105 @@ declare(strict_types=1);
namespace FireflyIII\Api\V2\Controllers\Autocomplete;
use FireflyIII\Api\V2\Controllers\Controller;
use FireflyIII\Api\V2\Request\Autocomplete\AutocompleteRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface as AdminAccountRepositoryInterface;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\Http\Api\AccountFilter;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use JsonException;
/**
* Class AccountController
*/
class AccountController extends Controller
{
use AccountFilter;
private array $balanceTypes;
private AdminAccountRepositoryInterface $adminRepository;
private AccountRepositoryInterface $repository;
/**
* AccountController constructor.
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$this->repository = app(AccountRepositoryInterface::class);
$this->adminRepository = app(AdminAccountRepositoryInterface::class);
return $next($request);
}
);
$this->balanceTypes = [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE,];
}
/**
* Documentation for this endpoint:
* TODO endpoint is not documented.
*
* @param AutocompleteRequest $request
*
* @return JsonResponse
* @throws JsonException
* @throws FireflyException
* @throws FireflyException
*/
public function accounts(AutocompleteRequest $request): JsonResponse
{
$data = $request->getData();
$types = $data['types'];
$query = $data['query'];
$date = $data['date'] ?? today(config('app.timezone'));
$this->adminRepository->setAdministrationId($data['administration_id']);
$return = [];
$result = $this->adminRepository->searchAccount((string)$query, $types, $data['limit']);
$defaultCurrency = app('amount')->getDefaultCurrency();
/** @var Account $account */
foreach ($result as $account) {
$nameWithBalance = $account->name;
$currency = $this->repository->getAccountCurrency($account) ?? $defaultCurrency;
if (in_array($account->accountType->type, $this->balanceTypes, true)) {
$balance = app('steam')->balance($account, $date);
$nameWithBalance = sprintf('%s (%s)', $account->name, app('amount')->formatAnything($currency, $balance, false));
}
$return[] = [
'id' => (string)$account->id,
'name' => $account->name,
'name_with_balance' => $nameWithBalance,
'type' => $account->accountType->type,
'currency_id' => $currency->id,
'currency_name' => $currency->name,
'currency_code' => $currency->code,
'currency_symbol' => $currency->symbol,
'currency_decimal_places' => $currency->decimal_places,
];
}
// custom order.
$order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
usort(
$return,
function ($a, $b) use ($order) {
$pos_a = array_search($a['type'], $order, true);
$pos_b = array_search($b['type'], $order, true);
return $pos_a - $pos_b;
}
);
return response()->json($return);
}
}

View File

@@ -32,6 +32,8 @@ use FireflyIII\Models\AccountType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
use Illuminate\Http\JsonResponse;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
/**
* Class AccountController
@@ -62,6 +64,8 @@ class AccountController extends Controller
*
* @param DateRequest $request
* @return JsonResponse
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
public function dashboard(DateRequest $request): JsonResponse
{

View File

@@ -79,7 +79,7 @@ class Controller extends BaseController
$page = 1;
}
$integers = ['limit'];
$integers = ['limit', 'administration'];
$dates = ['start', 'end', 'date'];
if ($page < 1) {

View File

@@ -37,8 +37,6 @@ class ShowController extends Controller
{
/**
* TODO this endpoint is not yet reachable.
* @param Account $account
* @return JsonResponse
*/
public function show(Request $request, Account $account): JsonResponse
{

View File

@@ -57,8 +57,6 @@ class ShowController extends Controller
* This endpoint is documented at:
* TODO add URL
*
* @param DateRequest $request
* @return JsonResponse
*/
public function budgeted(DateRequest $request, Budget $budget): JsonResponse
{
@@ -73,8 +71,6 @@ class ShowController extends Controller
* This endpoint is documented at:
* TODO add URL
*
* @param DateRequest $request
* @return JsonResponse
*/
public function spent(DateRequest $request, Budget $budget): JsonResponse
{

View File

@@ -50,7 +50,6 @@ class ListController extends Controller
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v2)#/budgets/listBudgetLimitByBudget
* @return JsonResponse
*/
public function index(DateRequest $request, Budget $budget): JsonResponse
{

View File

@@ -26,7 +26,6 @@ namespace FireflyIII\Api\V2\Controllers;
use FireflyIII\Api\V2\Request\Generic\SingleDateRequest;
use FireflyIII\Helpers\Report\NetWorthInterface;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
use Illuminate\Http\JsonResponse;
@@ -37,7 +36,7 @@ class NetWorthController extends Controller
{
use ConvertsExchangeRates;
private NetWorthInterface $netWorth;
private NetWorthInterface $netWorth;
/**
*
@@ -47,7 +46,7 @@ class NetWorthController extends Controller
parent::__construct();
$this->middleware(
function ($request, $next) {
$this->netWorth = app(NetWorthInterface::class);
$this->netWorth = app(NetWorthInterface::class);
$this->netWorth->setUser(auth()->user());
return $next($request);
}

View File

@@ -0,0 +1,98 @@
<?php
/*
* AutocompleteRequest.php
* Copyright (c) 2023 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V2\Request\Autocomplete;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\UserRole;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
use FireflyIII\User;
use FireflyIII\Validation\Administration\ValidatesAdministrationAccess;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator;
/**
* Class AutocompleteRequest
*/
class AutocompleteRequest extends FormRequest
{
use ConvertsDataTypes;
use ChecksLogin;
use ValidatesAdministrationAccess;
/**
* @return array
* @throws FireflyException
*/
public function getData(): array
{
$types = $this->convertString('types');
$array = [];
if ('' !== $types) {
$array = explode(',', $types);
}
$limit = $this->convertInteger('limit');
$limit = 0 === $limit ? 10 : $limit;
// remove 'initial balance' and another from allowed types. its internal
$array = array_diff($array, [AccountType::INITIAL_BALANCE, AccountType::RECONCILIATION]);
/** @var User $user */
$user = auth()->user();
return [
'types' => $array,
'query' => $this->convertString('query'),
'date' => $this->getCarbonDate('date'),
'limit' => $limit,
'administration_id' => (int)($this->get('administration_id', null) ?? $user->getAdministrationId()),
];
}
/**
* @return array
*/
public function rules(): array
{
return [
'limit' => 'min:0|max:1337',
];
}
/**
* Configure the validator instance with special rules for after the basic validation rules.
*
* @param Validator $validator
*
* @return void
*/
public function withValidator(Validator $validator): void
{
$validator->after(
function (Validator $validator) {
// validate if the account can access this administration
$this->validateAdministration($validator, [UserRole::CHANGE_TRANSACTIONS]);
}
);
}
}

View File

@@ -34,7 +34,7 @@ use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use Illuminate\Console\Command;
use JsonException;
use Log;
use Illuminate\Support\Facades\Log;
/**
* Class CorrectOpeningBalanceCurrencies
@@ -94,6 +94,8 @@ class CorrectOpeningBalanceCurrencies extends Command
* @param TransactionJournal $journal
*
* @return int
* @throws FireflyException
* @throws JsonException
*/
private function correctJournal(TransactionJournal $journal): int
{

View File

@@ -26,7 +26,7 @@ namespace FireflyIII\Console\Commands\Correction;
use Exception;
use FireflyIII\Models\TransactionGroup;
use Illuminate\Console\Command;
use Log;
use Illuminate\Support\Facades\Log;
/**
* Class DeleteEmptyGroups

View File

@@ -28,7 +28,7 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Console\Command;
use Illuminate\Database\QueryException;
use Log;
use Illuminate\Support\Facades\Log;
/**
* Class DeleteEmptyJournals

View File

@@ -27,8 +27,7 @@ use Exception;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Console\Command;
use Illuminate\Database\QueryException;
use Log;
use Illuminate\Support\Facades\Log;
use stdClass;
/**

View File

@@ -26,7 +26,6 @@ namespace FireflyIII\Console\Commands\Correction;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Console\Command;
use Illuminate\Database\QueryException;
/**
* Class DeleteZeroAmount

View File

@@ -30,7 +30,7 @@ use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Console\Command;
use Illuminate\Support\Collection;
use Log;
use Illuminate\Support\Facades\Log;
/**
* Class EnableCurrencies

View File

@@ -30,7 +30,8 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use Illuminate\Console\Command;
use Log;
use JsonException;
use Illuminate\Support\Facades\Log;
/**
* Class FixAccountTypes
@@ -166,6 +167,7 @@ class FixAccountTypes extends Command
* @param Transaction $dest
*
* @throws FireflyException
* @throws JsonException
*/
private function fixJournal(TransactionJournal $journal, string $type, Transaction $source, Transaction $dest): void
{

Some files were not shown because too many files have changed in this diff Show More