mirror of
				https://github.com/firefly-iii/firefly-iii.git
				synced 2025-10-31 18:54:58 +00:00 
			
		
		
		
	Compare commits
	
		
			467 Commits
		
	
	
		
			develop-20
			...
			branch-v6.
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | f4868126c1 | ||
|  | 00147e98dd | ||
|  | 6d22663ca2 | ||
|  | 756bb9cf5e | ||
|  | 399d7968f5 | ||
|  | 966b68f42e | ||
|  | 134c551c12 | ||
|  | 9aeca15355 | ||
|  | 6c6d31830b | ||
|  | e8cc321898 | ||
|  | e73fe06f7e | ||
|  | 98b579c042 | ||
|  | 7b3a5c1afd | ||
|  | 7e2e49e129 | ||
|  | e8ef630424 | ||
|  | 8805bcf6f6 | ||
|  | ff5c9a3aa0 | ||
|  | 3a274dcaa7 | ||
|  | ddfededf02 | ||
|  | e1785898ba | ||
|  | ae09200f42 | ||
|  | 847984f678 | ||
|  | 42305672ac | ||
|  | 25a56d9f72 | ||
|  | 8f9f08b96f | ||
|  | 3c65b46aa5 | ||
|  | 1cf9c76329 | ||
|  | c0499df4ec | ||
|  | d90ac519f7 | ||
|  | a0e92b6969 | ||
|  | df49dd23e2 | ||
|  | d4525da6bc | ||
|  | 25b11bd20b | ||
|  | 705aac419a | ||
|  | f6e642f72e | ||
|  | 565bd87959 | ||
|  | 5751f7e5a3 | ||
|  | f5a755d4fc | ||
|  | a500de8ab1 | ||
|  | 303548a5fe | ||
|  | 68de905698 | ||
|  | 9240b9868b | ||
|  | 0e2e155cc6 | ||
|  | bffa0088b4 | ||
|  | 2e993857e8 | ||
|  | 117a376fc3 | ||
|  | 1daffedde0 | ||
|  | 0e8fdd76a6 | ||
|  | 7ff4f29bcb | ||
|  | 9e4cff2b23 | ||
|  | 4aaea89f2c | ||
|  | 4fbf7b38fb | ||
|  | 76075401f9 | ||
|  | e2a20dd63d | ||
|  | b52a1f3eb1 | ||
|  | 7fd5a88122 | ||
|  | 1a1baa5cda | ||
|  | 577d671a0c | ||
|  | 380029ffd8 | ||
|  | 76cc27a267 | ||
|  | e8a6f30e4e | ||
|  | fe6021a3d6 | ||
|  | 563c54702b | ||
|  | 4d67d27ba0 | ||
|  | edf3876a57 | ||
|  | 2d10f255c2 | ||
|  | ee76cc6761 | ||
|  | f197e6623b | ||
|  | 42a9809450 | ||
|  | 444f80a933 | ||
|  | 4b985c818a | ||
|  | 2e62fe7b72 | ||
|  | ccd182aed9 | ||
|  | 615eef3fdd | ||
|  | d4e4907363 | ||
|  | c205e93876 | ||
|  | 3b24bb99bb | ||
|  | 2814cd1b2a | ||
|  | 5285e1ac14 | ||
|  | 48a999cf91 | ||
|  | 3117c8846e | ||
|  | 6bb297e76f | ||
|  | bc698f67ea | ||
|  | f1c859aaa3 | ||
|  | 2d0aa207d4 | ||
|  | 4a75e9c262 | ||
|  | ee7c4b8863 | ||
|  | f782979d6c | ||
|  | 53cce6510c | ||
|  | 53252b84fd | ||
|  | 8f3cf38f77 | ||
|  | f33766a062 | ||
|  | ac5e62c65d | ||
|  | e2289ce1e6 | ||
|  | f0e2913802 | ||
|  | 1fa928b98f | ||
|  | 1c691cca33 | ||
|  | 69e1eb3eff | ||
|  | 90794cb515 | ||
|  | 28d7e24d30 | ||
|  | 6a62f781e9 | ||
|  | fb6c67fa04 | ||
|  | 03e9e3dbdb | ||
|  | 5520992861 | ||
|  | 5f1502eea7 | ||
|  | b3560ff525 | ||
|  | 8030167ffc | ||
|  | fd2c1615cf | ||
|  | b976239580 | ||
|  | 7d8d773f8f | ||
|  | b930ad4da7 | ||
|  | abad7cdf16 | ||
|  | 0e5eb036b0 | ||
|  | d995bfc081 | ||
|  | c920070ce2 | ||
|  | 277f5e538f | ||
|  | 89f197b9d4 | ||
|  | c35ff3174a | ||
|  | 94085ee940 | ||
|  | c841fa3620 | ||
|  | 69b2c1f4d2 | ||
|  | 2f7a1c941e | ||
|  | c06fb8daf6 | ||
|  | 26948a058a | ||
|  | 1220564f30 | ||
|  | ea4be9dd0c | ||
|  | 1ccda0b598 | ||
|  | eb3b67ffd6 | ||
|  | 4819b5ac5d | ||
|  | 591b795aa3 | ||
|  | ac21ed7d18 | ||
|  | d9c66a2db0 | ||
|  | d740814f88 | ||
|  | cdf1ebf3f7 | ||
|  | f2fab5d4ee | ||
|  | 21a6927279 | ||
|  | 92190bbc54 | ||
|  | 9ad005e31f | ||
|  | f5c56e02da | ||
|  | 6f02eff020 | ||
|  | c25c0d37c5 | ||
|  | 4ba1c5bcfc | ||
|  | 64aefe5848 | ||
|  | 73f2f71b03 | ||
|  | 12ee37d700 | ||
|  | 9679c22a27 | ||
|  | 1395c95353 | ||
|  | 4d1fd43c8c | ||
|  | 71c208c4fb | ||
|  | 91a2a1afc3 | ||
|  | 25c1ca2f5d | ||
|  | 6f0bb82f59 | ||
|  | 22a5184ebe | ||
|  | 17b0b1f43f | ||
|  | b61df5ec19 | ||
|  | 1ac7275f83 | ||
|  | cd10d04907 | ||
|  | f9b76fcb8b | ||
|  | 093fa067e6 | ||
|  | fa655f065b | ||
|  | c8f2244912 | ||
|  | f3a20e14a6 | ||
|  | 33ad47b115 | ||
|  | 775424d3b7 | ||
|  | c9c86bbd1d | ||
|  | f76a6ad85c | ||
|  | 2138b14d89 | ||
|  | 1bf61f57f5 | ||
|  | 07b55bd71f | ||
|  | 8d2d3d4002 | ||
|  | d182b4b4a6 | ||
|  | 60f6a91fe4 | ||
|  | ec89a2f956 | ||
|  | 87113d7181 | ||
|  | 59fae290e5 | ||
|  | 1a8ba2ce53 | ||
|  | dddaa25d86 | ||
|  | f28341587a | ||
|  | 5593bf3e08 | ||
|  | 92574a7a9d | ||
|  | e049266f5d | ||
|  | 5b3e6fcb07 | ||
|  | b0bfb556db | ||
|  | 484acbcb45 | ||
|  | cdc802cfb8 | ||
|  | 582671ca84 | ||
|  | 22498b5804 | ||
|  | 87f277a482 | ||
|  | ae0d74f57a | ||
|  | 0ae5593dde | ||
|  | 0d11769590 | ||
|  | b7d8daf013 | ||
|  | a9c0126b05 | ||
|  | 6bc5a57d10 | ||
|  | 2714ee96f1 | ||
|  | 524d382b7a | ||
|  | 2723e05d2a | ||
|  | 6dd9bda6b4 | ||
|  | 44449bc716 | ||
|  | b17d8edb50 | ||
|  | 578072238a | ||
|  | b4edd3dcc4 | ||
|  | 068094caac | ||
|  | deb58e617d | ||
|  | baca0c1120 | ||
|  | 02543438a4 | ||
|  | d507e59038 | ||
|  | 9d0fd7ef1b | ||
|  | dbef5e2143 | ||
|  | 04eca755d2 | ||
|  | 7883692196 | ||
|  | 8f64977cb9 | ||
|  | f94fdc4979 | ||
|  | a0a0e28447 | ||
|  | f6f7783b94 | ||
|  | d233cc1de8 | ||
|  | 37671499c8 | ||
|  | c83b79998d | ||
|  | ed842c2b42 | ||
|  | 8c5f114339 | ||
|  | 8b2f1d0b4f | ||
|  | 591a1b3050 | ||
|  | 42ec3fe02b | ||
|  | 370a398b5e | ||
|  | 554d89b6e9 | ||
|  | cb049f5dda | ||
|  | 0728668d41 | ||
|  | dfc187874e | ||
|  | 225588f3e7 | ||
|  | 06cc6c29aa | ||
|  | b2d4469908 | ||
|  | c398383905 | ||
|  | 7af9dce33b | ||
|  | 038790a5d6 | ||
|  | fb3295bde1 | ||
|  | 43a4fd2ecb | ||
|  | 899c72d068 | ||
|  | d118c0d886 | ||
|  | 6d4004d1ed | ||
|  | ae60cd5b28 | ||
|  | ab31a72199 | ||
|  | 2c1b9534f3 | ||
|  | 7028cb1546 | ||
|  | dc1ecf6a42 | ||
|  | 3a27f9d02c | ||
|  | 4b27ab38f8 | ||
|  | 40de147611 | ||
|  | df5756dc86 | ||
|  | bb4f90d730 | ||
|  | d89d46aaec | ||
|  | 304d720c4c | ||
|  | 7eff160190 | ||
|  | 8b2e18ed9d | ||
|  | 7001051833 | ||
|  | b4b9752c05 | ||
|  | acadc89eaa | ||
|  | 6ff84b8e90 | ||
|  | 7f3e3fc3bf | ||
|  | 02233fd7a4 | ||
|  | 50d3db0643 | ||
|  | 3751831779 | ||
|  | 14a24e47fb | ||
|  | b7e78cb0e6 | ||
|  | a8f65f42fc | ||
|  | d3385a116d | ||
|  | e0c446dd13 | ||
|  | 33d11b4780 | ||
|  | 07c49d1d04 | ||
|  | 9463285ac9 | ||
|  | b41fc43e64 | ||
|  | 562763c938 | ||
|  | ec60194110 | ||
|  | 1e472ee095 | ||
|  | 5597327448 | ||
|  | cdd5baf5be | ||
|  | 7b5978059b | ||
|  | da0b41e45c | ||
|  | d0be2afba5 | ||
|  | d99851231a | ||
|  | 7e02c141f9 | ||
|  | d03960e379 | ||
|  | 16d3984ffc | ||
|  | 856a194988 | ||
|  | 1bff966bfe | ||
|  | 1948b6118b | ||
|  | 20c25d3ca2 | ||
|  | a153735ac3 | ||
|  | 62509f7c18 | ||
|  | 9b48b67158 | ||
|  | cbd50634a4 | ||
|  | f475393bc1 | ||
|  | abcddb09bf | ||
|  | cf71a0fc55 | ||
|  | 78253f9e1e | ||
|  | ebd0848c7f | ||
|  | c8461eb0b5 | ||
|  | a4cbdeaeac | ||
|  | 3e1ce69d52 | ||
|  | 08a26b976e | ||
|  | 5fc55381a2 | ||
|  | dbf3d24ae7 | ||
|  | cc7c6e02c5 | ||
|  | b45aa85853 | ||
|  | e7526ac5e3 | ||
|  | 441ada70b8 | ||
|  | dedc06a46b | ||
|  | b0adf1b277 | ||
|  | 28f65e9f44 | ||
|  | a013af5f0d | ||
|  | 9552701662 | ||
|  | ef52f0aad1 | ||
|  | 0b6f04905a | ||
|  | cdb36357d4 | ||
|  | 8938622bd9 | ||
|  | b210294aa9 | ||
|  | 5b02f20775 | ||
|  | fac382a5df | ||
|  | 88d88bebc9 | ||
|  | 755fb9c29b | ||
|  | 51a835ab51 | ||
|  | c9895ab182 | ||
|  | e71d46a4e5 | ||
|  | 8d1d5f37c1 | ||
|  | 525a68682d | ||
|  | 715648d0d8 | ||
|  | 9452e93f22 | ||
|  | a6aa145471 | ||
|  | 25aa6dcb59 | ||
|  | bb2270b274 | ||
|  | d7f6b4143e | ||
|  | 0cf0e26fa8 | ||
|  | cc23197d60 | ||
|  | bc1721d95e | ||
|  | 0d19173da6 | ||
|  | 1983f07d3c | ||
|  | aad1b91cc2 | ||
|  | 8cb1057a33 | ||
|  | b178032985 | ||
|  | 561213e95d | ||
|  | 44fa7c4306 | ||
|  | e2169563e2 | ||
|  | 845344e003 | ||
|  | cdb48453e8 | ||
|  | 9669cef518 | ||
|  | f962f71ed7 | ||
|  | 94ed4021fb | ||
|  | 1765855c57 | ||
|  | 55cf3e7d44 | ||
|  | 9f1840dc05 | ||
|  | 78dab2e5f9 | ||
|  | 103b9d5005 | ||
|  | 1b75b778d8 | ||
|  | 7e665dbdfc | ||
|  | b6897ec3a9 | ||
|  | 660260174a | ||
|  | 78d32865b5 | ||
|  | edfa92c1aa | ||
|  | 63012f269c | ||
|  | 7d0e7f779f | ||
|  | b8e18f80f4 | ||
|  | 481b01e4f7 | ||
|  | edf2030251 | ||
|  | bd1cfffb61 | ||
|  | 629f70d27d | ||
|  | 57f5ebc0f9 | ||
|  | b4f51e7b47 | ||
|  | d78d254e86 | ||
|  | eb0c113699 | ||
|  | 23045ebd59 | ||
|  | 2e5931f304 | ||
|  | a620b07c00 | ||
|  | cb724145f2 | ||
|  | 8ef17f6686 | ||
|  | debfd9160c | ||
|  | f2482e4ace | ||
|  | d98d757f8b | ||
|  | 0c9a41a929 | ||
|  | e26f78bf50 | ||
|  | ed265f68ba | ||
|  | d2e9b64bf5 | ||
|  | 3811aff206 | ||
|  | 762d898fee | ||
|  | 5e6034fc86 | ||
|  | 9da10459d6 | ||
|  | ff80cedd6b | ||
|  | b213148ae8 | ||
|  | c8646e20cb | ||
|  | 76a41fec50 | ||
|  | 0e705bd038 | ||
|  | f33ffb98ff | ||
|  | faa0d59340 | ||
|  | 5af0219884 | ||
|  | dafd99f155 | ||
|  | 3560f0388c | ||
|  | b2954658d8 | ||
|  | 44581d9983 | ||
|  | 02dcfeb227 | ||
|  | d8bafb349d | ||
|  | 889598a4c8 | ||
|  | 7e37d10016 | ||
|  | ebaebb09d1 | ||
|  | 531a3a4b6c | ||
|  | b3e313821b | ||
|  | 51958af422 | ||
|  | e3b21ccdba | ||
|  | 31bb208835 | ||
|  | 8c97e805a2 | ||
|  | ac8a43bb37 | ||
|  | 2df4b40a28 | ||
|  | e06736c254 | ||
|  | ec367e94ce | ||
|  | 1515dea9fa | ||
|  | adedf9c17d | ||
|  | 0b52fb84f1 | ||
|  | 16e742ae73 | ||
|  | 1b4471dfae | ||
|  | ae152ce0a4 | ||
|  | 2aa023f140 | ||
|  | 6e2e4c6f08 | ||
|  | 1c8c038735 | ||
|  | 4d339a6da8 | ||
|  | b7edd4407a | ||
|  | a679a1e94a | ||
|  | 180451d32f | ||
|  | 7396f22bca | ||
|  | 058019aa84 | ||
|  | 695f83d1d8 | ||
|  | ac4dfb3baf | ||
|  | 427001b223 | ||
|  | 3117d8b30d | ||
|  | d19dd2a8b2 | ||
|  | de3dcc3fc2 | ||
|  | 077f3e095b | ||
|  | ad3b0bb320 | ||
|  | 8538741341 | ||
|  | a0aef5d579 | ||
|  | fdd93427aa | ||
|  | ac3f6557de | ||
|  | b0a909150c | ||
|  | 913f163fe4 | ||
|  | 3126b07b33 | ||
|  | 08ca90cf75 | ||
|  | 540ac2a277 | ||
|  | ed80bed066 | ||
|  | 41d2541c6a | ||
|  | 5dedf63498 | ||
|  | 09bc4f41d2 | ||
|  | cebf0b5c57 | ||
|  | 1632a57e3e | ||
|  | 744c4be7d1 | ||
|  | bd99ef3eff | ||
|  | 8a86f13a5d | ||
|  | 7418b2f0ee | ||
|  | a0e9de9312 | ||
|  | 7e23a6f5e8 | ||
|  | 44589f8744 | ||
|  | d24531030f | ||
|  | 25bdab1346 | ||
|  | 41af1c863a | ||
|  | 76b3b18cfb | ||
|  | e6fb2958a9 | ||
|  | 15b75b322f | ||
|  | 86149d1032 | ||
|  | ded142cd9e | ||
|  | 7923eb9ec9 | ||
|  | 132553c108 | ||
|  | aed30d1499 | 
							
								
								
									
										362
									
								
								.ci/php-cs-fixer/composer.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										362
									
								
								.ci/php-cs-fixer/composer.lock
									
									
									
										generated
									
									
									
								
							| @@ -72,28 +72,36 @@ | ||||
|         }, | ||||
|         { | ||||
|             "name": "composer/pcre", | ||||
|             "version": "3.1.4", | ||||
|             "version": "3.3.2", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/composer/pcre.git", | ||||
|                 "reference": "04229f163664973f68f38f6f73d917799168ef24" | ||||
|                 "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/composer/pcre/zipball/04229f163664973f68f38f6f73d917799168ef24", | ||||
|                 "reference": "04229f163664973f68f38f6f73d917799168ef24", | ||||
|                 "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e", | ||||
|                 "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
|                 "php": "^7.4 || ^8.0" | ||||
|             }, | ||||
|             "conflict": { | ||||
|                 "phpstan/phpstan": "<1.11.10" | ||||
|             }, | ||||
|             "require-dev": { | ||||
|                 "phpstan/phpstan": "^1.3", | ||||
|                 "phpstan/phpstan-strict-rules": "^1.1", | ||||
|                 "symfony/phpunit-bridge": "^5" | ||||
|                 "phpstan/phpstan": "^1.12 || ^2", | ||||
|                 "phpstan/phpstan-strict-rules": "^1 || ^2", | ||||
|                 "phpunit/phpunit": "^8 || ^9" | ||||
|             }, | ||||
|             "type": "library", | ||||
|             "extra": { | ||||
|                 "phpstan": { | ||||
|                     "includes": [ | ||||
|                         "extension.neon" | ||||
|                     ] | ||||
|                 }, | ||||
|                 "branch-alias": { | ||||
|                     "dev-main": "3.x-dev" | ||||
|                 } | ||||
| @@ -123,7 +131,7 @@ | ||||
|             ], | ||||
|             "support": { | ||||
|                 "issues": "https://github.com/composer/pcre/issues", | ||||
|                 "source": "https://github.com/composer/pcre/tree/3.1.4" | ||||
|                 "source": "https://github.com/composer/pcre/tree/3.3.2" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -139,28 +147,28 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-05-27T13:40:54+00:00" | ||||
|             "time": "2024-11-12T16:29:46+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "composer/semver", | ||||
|             "version": "3.4.0", | ||||
|             "version": "3.4.3", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/composer/semver.git", | ||||
|                 "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" | ||||
|                 "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", | ||||
|                 "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", | ||||
|                 "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", | ||||
|                 "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
|                 "php": "^5.3.2 || ^7.0 || ^8.0" | ||||
|             }, | ||||
|             "require-dev": { | ||||
|                 "phpstan/phpstan": "^1.4", | ||||
|                 "symfony/phpunit-bridge": "^4.2 || ^5" | ||||
|                 "phpstan/phpstan": "^1.11", | ||||
|                 "symfony/phpunit-bridge": "^3 || ^7" | ||||
|             }, | ||||
|             "type": "library", | ||||
|             "extra": { | ||||
| @@ -204,7 +212,7 @@ | ||||
|             "support": { | ||||
|                 "irc": "ircs://irc.libera.chat:6697/composer", | ||||
|                 "issues": "https://github.com/composer/semver/issues", | ||||
|                 "source": "https://github.com/composer/semver/tree/3.4.0" | ||||
|                 "source": "https://github.com/composer/semver/tree/3.4.3" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -220,7 +228,7 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2023-08-31T09:50:34+00:00" | ||||
|             "time": "2024-09-19T14:15:21+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "composer/xdebug-handler", | ||||
| @@ -337,16 +345,16 @@ | ||||
|         }, | ||||
|         { | ||||
|             "name": "fidry/cpu-core-counter", | ||||
|             "version": "1.1.0", | ||||
|             "version": "1.2.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/theofidry/cpu-core-counter.git", | ||||
|                 "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42" | ||||
|                 "reference": "8520451a140d3f46ac33042715115e290cf5785f" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42", | ||||
|                 "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42", | ||||
|                 "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f", | ||||
|                 "reference": "8520451a140d3f46ac33042715115e290cf5785f", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @@ -386,7 +394,7 @@ | ||||
|             ], | ||||
|             "support": { | ||||
|                 "issues": "https://github.com/theofidry/cpu-core-counter/issues", | ||||
|                 "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0" | ||||
|                 "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -394,20 +402,20 @@ | ||||
|                     "type": "github" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-02-07T09:43:46+00:00" | ||||
|             "time": "2024-08-06T10:04:20+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "friendsofphp/php-cs-fixer", | ||||
|             "version": "v3.59.3", | ||||
|             "version": "v3.65.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", | ||||
|                 "reference": "30ba9ecc2b0e5205e578fe29973c15653d9bfd29" | ||||
|                 "reference": "79d4f3e77b250a7d8043d76c6af8f0695e8a469f" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/30ba9ecc2b0e5205e578fe29973c15653d9bfd29", | ||||
|                 "reference": "30ba9ecc2b0e5205e578fe29973c15653d9bfd29", | ||||
|                 "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/79d4f3e77b250a7d8043d76c6af8f0695e8a469f", | ||||
|                 "reference": "79d4f3e77b250a7d8043d76c6af8f0695e8a469f", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @@ -417,7 +425,7 @@ | ||||
|                 "ext-filter": "*", | ||||
|                 "ext-json": "*", | ||||
|                 "ext-tokenizer": "*", | ||||
|                 "fidry/cpu-core-counter": "^1.0", | ||||
|                 "fidry/cpu-core-counter": "^1.2", | ||||
|                 "php": "^7.4 || ^8.0", | ||||
|                 "react/child-process": "^0.6.5", | ||||
|                 "react/event-loop": "^1.0", | ||||
| @@ -437,18 +445,18 @@ | ||||
|                 "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0" | ||||
|             }, | ||||
|             "require-dev": { | ||||
|                 "facile-it/paraunit": "^1.3 || ^2.3", | ||||
|                 "infection/infection": "^0.29.5", | ||||
|                 "justinrainbow/json-schema": "^5.2", | ||||
|                 "facile-it/paraunit": "^1.3.1 || ^2.4", | ||||
|                 "infection/infection": "^0.29.8", | ||||
|                 "justinrainbow/json-schema": "^5.3 || ^6.0", | ||||
|                 "keradus/cli-executor": "^2.1", | ||||
|                 "mikey179/vfsstream": "^1.6.11", | ||||
|                 "mikey179/vfsstream": "^1.6.12", | ||||
|                 "php-coveralls/php-coveralls": "^2.7", | ||||
|                 "php-cs-fixer/accessible-object": "^1.1", | ||||
|                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.5", | ||||
|                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.5", | ||||
|                 "phpunit/phpunit": "^9.6.19 || ^10.5.21 || ^11.2", | ||||
|                 "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0", | ||||
|                 "symfony/yaml": "^5.4 || ^6.0 || ^7.0" | ||||
|                 "phpunit/phpunit": "^9.6.21 || ^10.5.38 || ^11.4.3", | ||||
|                 "symfony/var-dumper": "^5.4.47 || ^6.4.15 || ^7.1.8", | ||||
|                 "symfony/yaml": "^5.4.45 || ^6.4.13 || ^7.1.6" | ||||
|             }, | ||||
|             "suggest": { | ||||
|                 "ext-dom": "For handling output formats in XML", | ||||
| @@ -489,7 +497,7 @@ | ||||
|             ], | ||||
|             "support": { | ||||
|                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", | ||||
|                 "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.59.3" | ||||
|                 "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.65.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -497,7 +505,7 @@ | ||||
|                     "type": "github" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-06-16T14:17:03+00:00" | ||||
|             "time": "2024-11-25T00:39:24+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "psr/container", | ||||
| @@ -604,16 +612,16 @@ | ||||
|         }, | ||||
|         { | ||||
|             "name": "psr/log", | ||||
|             "version": "3.0.0", | ||||
|             "version": "3.0.2", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/php-fig/log.git", | ||||
|                 "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" | ||||
|                 "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", | ||||
|                 "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", | ||||
|                 "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", | ||||
|                 "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @@ -648,9 +656,9 @@ | ||||
|                 "psr-3" | ||||
|             ], | ||||
|             "support": { | ||||
|                 "source": "https://github.com/php-fig/log/tree/3.0.0" | ||||
|                 "source": "https://github.com/php-fig/log/tree/3.0.2" | ||||
|             }, | ||||
|             "time": "2021-07-14T16:46:02+00:00" | ||||
|             "time": "2024-09-11T13:17:53+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "react/cache", | ||||
| @@ -1026,31 +1034,31 @@ | ||||
|         }, | ||||
|         { | ||||
|             "name": "react/socket", | ||||
|             "version": "v1.15.0", | ||||
|             "version": "v1.16.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/reactphp/socket.git", | ||||
|                 "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038" | ||||
|                 "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/reactphp/socket/zipball/216d3aec0b87f04a40ca04f481e6af01bdd1d038", | ||||
|                 "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038", | ||||
|                 "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1", | ||||
|                 "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
|                 "evenement/evenement": "^3.0 || ^2.0 || ^1.0", | ||||
|                 "php": ">=5.3.0", | ||||
|                 "react/dns": "^1.11", | ||||
|                 "react/dns": "^1.13", | ||||
|                 "react/event-loop": "^1.2", | ||||
|                 "react/promise": "^3 || ^2.6 || ^1.2.1", | ||||
|                 "react/stream": "^1.2" | ||||
|                 "react/promise": "^3.2 || ^2.6 || ^1.2.1", | ||||
|                 "react/stream": "^1.4" | ||||
|             }, | ||||
|             "require-dev": { | ||||
|                 "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36", | ||||
|                 "react/async": "^4 || ^3 || ^2", | ||||
|                 "react/async": "^4.3 || ^3.3 || ^2", | ||||
|                 "react/promise-stream": "^1.4", | ||||
|                 "react/promise-timer": "^1.10" | ||||
|                 "react/promise-timer": "^1.11" | ||||
|             }, | ||||
|             "type": "library", | ||||
|             "autoload": { | ||||
| @@ -1094,7 +1102,7 @@ | ||||
|             ], | ||||
|             "support": { | ||||
|                 "issues": "https://github.com/reactphp/socket/issues", | ||||
|                 "source": "https://github.com/reactphp/socket/tree/v1.15.0" | ||||
|                 "source": "https://github.com/reactphp/socket/tree/v1.16.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -1102,7 +1110,7 @@ | ||||
|                     "type": "open_collective" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2023-12-15T11:02:10+00:00" | ||||
|             "time": "2024-07-26T10:38:09+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "react/stream", | ||||
| @@ -1251,16 +1259,16 @@ | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/console", | ||||
|             "version": "v7.1.2", | ||||
|             "version": "v7.2.1", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/console.git", | ||||
|                 "reference": "0aa29ca177f432ab68533432db0de059f39c92ae" | ||||
|                 "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/console/zipball/0aa29ca177f432ab68533432db0de059f39c92ae", | ||||
|                 "reference": "0aa29ca177f432ab68533432db0de059f39c92ae", | ||||
|                 "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3", | ||||
|                 "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @@ -1324,7 +1332,7 @@ | ||||
|                 "terminal" | ||||
|             ], | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/console/tree/v7.1.2" | ||||
|                 "source": "https://github.com/symfony/console/tree/v7.2.1" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -1340,20 +1348,20 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-06-28T10:03:55+00:00" | ||||
|             "time": "2024-12-11T03:49:26+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/deprecation-contracts", | ||||
|             "version": "v3.5.0", | ||||
|             "version": "v3.5.1", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/deprecation-contracts.git", | ||||
|                 "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" | ||||
|                 "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", | ||||
|                 "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", | ||||
|                 "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", | ||||
|                 "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @@ -1391,7 +1399,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.5.0" | ||||
|                 "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -1407,20 +1415,20 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-04-18T09:32:20+00:00" | ||||
|             "time": "2024-09-25T14:20:29+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/event-dispatcher", | ||||
|             "version": "v7.1.1", | ||||
|             "version": "v7.2.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/event-dispatcher.git", | ||||
|                 "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7" | ||||
|                 "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7", | ||||
|                 "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7", | ||||
|                 "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/910c5db85a5356d0fea57680defec4e99eb9c8c1", | ||||
|                 "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @@ -1471,7 +1479,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/v7.1.1" | ||||
|                 "source": "https://github.com/symfony/event-dispatcher/tree/v7.2.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -1487,20 +1495,20 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-05-31T14:57:53+00:00" | ||||
|             "time": "2024-09-25T14:21:43+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/event-dispatcher-contracts", | ||||
|             "version": "v3.5.0", | ||||
|             "version": "v3.5.1", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/event-dispatcher-contracts.git", | ||||
|                 "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50" | ||||
|                 "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50", | ||||
|                 "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50", | ||||
|                 "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f", | ||||
|                 "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @@ -1547,7 +1555,7 @@ | ||||
|                 "standards" | ||||
|             ], | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0" | ||||
|                 "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -1563,20 +1571,20 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-04-18T09:32:20+00:00" | ||||
|             "time": "2024-09-25T14:20:29+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/filesystem", | ||||
|             "version": "v7.1.2", | ||||
|             "version": "v7.2.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/filesystem.git", | ||||
|                 "reference": "92a91985250c251de9b947a14bb2c9390b1a562c" | ||||
|                 "reference": "b8dce482de9d7c9fe2891155035a7248ab5c7fdb" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/filesystem/zipball/92a91985250c251de9b947a14bb2c9390b1a562c", | ||||
|                 "reference": "92a91985250c251de9b947a14bb2c9390b1a562c", | ||||
|                 "url": "https://api.github.com/repos/symfony/filesystem/zipball/b8dce482de9d7c9fe2891155035a7248ab5c7fdb", | ||||
|                 "reference": "b8dce482de9d7c9fe2891155035a7248ab5c7fdb", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @@ -1613,7 +1621,7 @@ | ||||
|             "description": "Provides basic utilities for the filesystem", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/filesystem/tree/v7.1.2" | ||||
|                 "source": "https://github.com/symfony/filesystem/tree/v7.2.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -1629,20 +1637,20 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-06-28T10:03:55+00:00" | ||||
|             "time": "2024-10-25T15:15:23+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/finder", | ||||
|             "version": "v7.1.1", | ||||
|             "version": "v7.2.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/finder.git", | ||||
|                 "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6" | ||||
|                 "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/finder/zipball/fbb0ba67688b780efbc886c1a0a0948dcf7205d6", | ||||
|                 "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6", | ||||
|                 "url": "https://api.github.com/repos/symfony/finder/zipball/6de263e5868b9a137602dd1e33e4d48bfae99c49", | ||||
|                 "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @@ -1677,7 +1685,7 @@ | ||||
|             "description": "Finds files and directories via an intuitive fluent interface", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/finder/tree/v7.1.1" | ||||
|                 "source": "https://github.com/symfony/finder/tree/v7.2.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -1693,20 +1701,20 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-05-31T14:57:53+00:00" | ||||
|             "time": "2024-10-23T06:56:12+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/options-resolver", | ||||
|             "version": "v7.1.1", | ||||
|             "version": "v7.2.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/options-resolver.git", | ||||
|                 "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55" | ||||
|                 "reference": "7da8fbac9dcfef75ffc212235d76b2754ce0cf50" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/options-resolver/zipball/47aa818121ed3950acd2b58d1d37d08a94f9bf55", | ||||
|                 "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55", | ||||
|                 "url": "https://api.github.com/repos/symfony/options-resolver/zipball/7da8fbac9dcfef75ffc212235d76b2754ce0cf50", | ||||
|                 "reference": "7da8fbac9dcfef75ffc212235d76b2754ce0cf50", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @@ -1744,7 +1752,7 @@ | ||||
|                 "options" | ||||
|             ], | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/options-resolver/tree/v7.1.1" | ||||
|                 "source": "https://github.com/symfony/options-resolver/tree/v7.2.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -1760,24 +1768,24 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-05-31T14:57:53+00:00" | ||||
|             "time": "2024-11-20T11:17:29+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/polyfill-ctype", | ||||
|             "version": "v1.30.0", | ||||
|             "version": "v1.31.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/polyfill-ctype.git", | ||||
|                 "reference": "0424dff1c58f028c451efff2045f5d92410bd540" | ||||
|                 "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540", | ||||
|                 "reference": "0424dff1c58f028c451efff2045f5d92410bd540", | ||||
|                 "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", | ||||
|                 "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
|                 "php": ">=7.1" | ||||
|                 "php": ">=7.2" | ||||
|             }, | ||||
|             "provide": { | ||||
|                 "ext-ctype": "*" | ||||
| @@ -1788,8 +1796,8 @@ | ||||
|             "type": "library", | ||||
|             "extra": { | ||||
|                 "thanks": { | ||||
|                     "name": "symfony/polyfill", | ||||
|                     "url": "https://github.com/symfony/polyfill" | ||||
|                     "url": "https://github.com/symfony/polyfill", | ||||
|                     "name": "symfony/polyfill" | ||||
|                 } | ||||
|             }, | ||||
|             "autoload": { | ||||
| @@ -1823,7 +1831,7 @@ | ||||
|                 "portable" | ||||
|             ], | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0" | ||||
|                 "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -1839,24 +1847,24 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-05-31T15:07:36+00:00" | ||||
|             "time": "2024-09-09T11:45:10+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/polyfill-intl-grapheme", | ||||
|             "version": "v1.30.0", | ||||
|             "version": "v1.31.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git", | ||||
|                 "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a" | ||||
|                 "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a", | ||||
|                 "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a", | ||||
|                 "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", | ||||
|                 "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
|                 "php": ">=7.1" | ||||
|                 "php": ">=7.2" | ||||
|             }, | ||||
|             "suggest": { | ||||
|                 "ext-intl": "For best performance" | ||||
| @@ -1864,8 +1872,8 @@ | ||||
|             "type": "library", | ||||
|             "extra": { | ||||
|                 "thanks": { | ||||
|                     "name": "symfony/polyfill", | ||||
|                     "url": "https://github.com/symfony/polyfill" | ||||
|                     "url": "https://github.com/symfony/polyfill", | ||||
|                     "name": "symfony/polyfill" | ||||
|                 } | ||||
|             }, | ||||
|             "autoload": { | ||||
| @@ -1901,7 +1909,7 @@ | ||||
|                 "shim" | ||||
|             ], | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0" | ||||
|                 "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -1917,24 +1925,24 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-05-31T15:07:36+00:00" | ||||
|             "time": "2024-09-09T11:45:10+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/polyfill-intl-normalizer", | ||||
|             "version": "v1.30.0", | ||||
|             "version": "v1.31.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git", | ||||
|                 "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb" | ||||
|                 "reference": "3833d7255cc303546435cb650316bff708a1c75c" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb", | ||||
|                 "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb", | ||||
|                 "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", | ||||
|                 "reference": "3833d7255cc303546435cb650316bff708a1c75c", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
|                 "php": ">=7.1" | ||||
|                 "php": ">=7.2" | ||||
|             }, | ||||
|             "suggest": { | ||||
|                 "ext-intl": "For best performance" | ||||
| @@ -1942,8 +1950,8 @@ | ||||
|             "type": "library", | ||||
|             "extra": { | ||||
|                 "thanks": { | ||||
|                     "name": "symfony/polyfill", | ||||
|                     "url": "https://github.com/symfony/polyfill" | ||||
|                     "url": "https://github.com/symfony/polyfill", | ||||
|                     "name": "symfony/polyfill" | ||||
|                 } | ||||
|             }, | ||||
|             "autoload": { | ||||
| @@ -1982,7 +1990,7 @@ | ||||
|                 "shim" | ||||
|             ], | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0" | ||||
|                 "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -1998,24 +2006,24 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-05-31T15:07:36+00:00" | ||||
|             "time": "2024-09-09T11:45:10+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/polyfill-mbstring", | ||||
|             "version": "v1.30.0", | ||||
|             "version": "v1.31.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/polyfill-mbstring.git", | ||||
|                 "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c" | ||||
|                 "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c", | ||||
|                 "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c", | ||||
|                 "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", | ||||
|                 "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
|                 "php": ">=7.1" | ||||
|                 "php": ">=7.2" | ||||
|             }, | ||||
|             "provide": { | ||||
|                 "ext-mbstring": "*" | ||||
| @@ -2026,8 +2034,8 @@ | ||||
|             "type": "library", | ||||
|             "extra": { | ||||
|                 "thanks": { | ||||
|                     "name": "symfony/polyfill", | ||||
|                     "url": "https://github.com/symfony/polyfill" | ||||
|                     "url": "https://github.com/symfony/polyfill", | ||||
|                     "name": "symfony/polyfill" | ||||
|                 } | ||||
|             }, | ||||
|             "autoload": { | ||||
| @@ -2062,7 +2070,7 @@ | ||||
|                 "shim" | ||||
|             ], | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0" | ||||
|                 "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -2078,30 +2086,30 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-06-19T12:30:46+00:00" | ||||
|             "time": "2024-09-09T11:45:10+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/polyfill-php80", | ||||
|             "version": "v1.30.0", | ||||
|             "version": "v1.31.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/polyfill-php80.git", | ||||
|                 "reference": "77fa7995ac1b21ab60769b7323d600a991a90433" | ||||
|                 "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433", | ||||
|                 "reference": "77fa7995ac1b21ab60769b7323d600a991a90433", | ||||
|                 "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", | ||||
|                 "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
|                 "php": ">=7.1" | ||||
|                 "php": ">=7.2" | ||||
|             }, | ||||
|             "type": "library", | ||||
|             "extra": { | ||||
|                 "thanks": { | ||||
|                     "name": "symfony/polyfill", | ||||
|                     "url": "https://github.com/symfony/polyfill" | ||||
|                     "url": "https://github.com/symfony/polyfill", | ||||
|                     "name": "symfony/polyfill" | ||||
|                 } | ||||
|             }, | ||||
|             "autoload": { | ||||
| @@ -2142,7 +2150,7 @@ | ||||
|                 "shim" | ||||
|             ], | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0" | ||||
|                 "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -2158,30 +2166,30 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-05-31T15:07:36+00:00" | ||||
|             "time": "2024-09-09T11:45:10+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/polyfill-php81", | ||||
|             "version": "v1.30.0", | ||||
|             "version": "v1.31.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/polyfill-php81.git", | ||||
|                 "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af" | ||||
|                 "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/3fb075789fb91f9ad9af537c4012d523085bd5af", | ||||
|                 "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af", | ||||
|                 "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", | ||||
|                 "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
|                 "php": ">=7.1" | ||||
|                 "php": ">=7.2" | ||||
|             }, | ||||
|             "type": "library", | ||||
|             "extra": { | ||||
|                 "thanks": { | ||||
|                     "name": "symfony/polyfill", | ||||
|                     "url": "https://github.com/symfony/polyfill" | ||||
|                     "url": "https://github.com/symfony/polyfill", | ||||
|                     "name": "symfony/polyfill" | ||||
|                 } | ||||
|             }, | ||||
|             "autoload": { | ||||
| @@ -2218,7 +2226,7 @@ | ||||
|                 "shim" | ||||
|             ], | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/polyfill-php81/tree/v1.30.0" | ||||
|                 "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -2234,20 +2242,20 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-06-19T12:30:46+00:00" | ||||
|             "time": "2024-09-09T11:45:10+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/process", | ||||
|             "version": "v7.1.1", | ||||
|             "version": "v7.2.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/process.git", | ||||
|                 "reference": "febf90124323a093c7ee06fdb30e765ca3c20028" | ||||
|                 "reference": "d34b22ba9390ec19d2dd966c40aa9e8462f27a7e" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/process/zipball/febf90124323a093c7ee06fdb30e765ca3c20028", | ||||
|                 "reference": "febf90124323a093c7ee06fdb30e765ca3c20028", | ||||
|                 "url": "https://api.github.com/repos/symfony/process/zipball/d34b22ba9390ec19d2dd966c40aa9e8462f27a7e", | ||||
|                 "reference": "d34b22ba9390ec19d2dd966c40aa9e8462f27a7e", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @@ -2279,7 +2287,7 @@ | ||||
|             "description": "Executes commands in sub-processes", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/process/tree/v7.1.1" | ||||
|                 "source": "https://github.com/symfony/process/tree/v7.2.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -2295,20 +2303,20 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-05-31T14:57:53+00:00" | ||||
|             "time": "2024-11-06T14:24:19+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/service-contracts", | ||||
|             "version": "v3.5.0", | ||||
|             "version": "v3.5.1", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/service-contracts.git", | ||||
|                 "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f" | ||||
|                 "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", | ||||
|                 "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", | ||||
|                 "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0", | ||||
|                 "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @@ -2362,7 +2370,7 @@ | ||||
|                 "standards" | ||||
|             ], | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/service-contracts/tree/v3.5.0" | ||||
|                 "source": "https://github.com/symfony/service-contracts/tree/v3.5.1" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -2378,20 +2386,20 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-04-18T09:32:20+00:00" | ||||
|             "time": "2024-09-25T14:20:29+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/stopwatch", | ||||
|             "version": "v7.1.1", | ||||
|             "version": "v7.2.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/stopwatch.git", | ||||
|                 "reference": "5b75bb1ac2ba1b9d05c47fc4b3046a625377d23d" | ||||
|                 "reference": "696f418b0d722a4225e1c3d95489d262971ca924" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5b75bb1ac2ba1b9d05c47fc4b3046a625377d23d", | ||||
|                 "reference": "5b75bb1ac2ba1b9d05c47fc4b3046a625377d23d", | ||||
|                 "url": "https://api.github.com/repos/symfony/stopwatch/zipball/696f418b0d722a4225e1c3d95489d262971ca924", | ||||
|                 "reference": "696f418b0d722a4225e1c3d95489d262971ca924", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @@ -2424,7 +2432,7 @@ | ||||
|             "description": "Provides a way to profile code", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/stopwatch/tree/v7.1.1" | ||||
|                 "source": "https://github.com/symfony/stopwatch/tree/v7.2.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -2440,20 +2448,20 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-05-31T14:57:53+00:00" | ||||
|             "time": "2024-09-25T14:21:43+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "symfony/string", | ||||
|             "version": "v7.1.2", | ||||
|             "version": "v7.2.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/symfony/string.git", | ||||
|                 "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8" | ||||
|                 "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/symfony/string/zipball/14221089ac66cf82e3cf3d1c1da65de305587ff8", | ||||
|                 "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8", | ||||
|                 "url": "https://api.github.com/repos/symfony/string/zipball/446e0d146f991dde3e73f45f2c97a9faad773c82", | ||||
|                 "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @@ -2511,7 +2519,7 @@ | ||||
|                 "utf8" | ||||
|             ], | ||||
|             "support": { | ||||
|                 "source": "https://github.com/symfony/string/tree/v7.1.2" | ||||
|                 "source": "https://github.com/symfony/string/tree/v7.2.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -2527,16 +2535,16 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-06-28T09:27:18+00:00" | ||||
|             "time": "2024-11-13T13:31:26+00:00" | ||||
|         } | ||||
|     ], | ||||
|     "packages-dev": [], | ||||
|     "aliases": [], | ||||
|     "minimum-stability": "stable", | ||||
|     "stability-flags": [], | ||||
|     "stability-flags": {}, | ||||
|     "prefer-stable": false, | ||||
|     "prefer-lowest": false, | ||||
|     "platform": [], | ||||
|     "platform-dev": [], | ||||
|     "platform": {}, | ||||
|     "platform-dev": {}, | ||||
|     "plugin-api-version": "2.6.0" | ||||
| } | ||||
|   | ||||
| @@ -26,8 +26,7 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) | ||||
| cd $SCRIPT_DIR/php-cs-fixer | ||||
| composer update --quiet | ||||
| rm -f .php-cs-fixer.cache | ||||
| PHP_CS_FIXER_IGNORE_ENV=true | ||||
| ./vendor/bin/php-cs-fixer fix \ | ||||
| PHP_CS_FIXER_IGNORE_ENV=true ./vendor/bin/php-cs-fixer fix \ | ||||
|     --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php \ | ||||
|     --format=txt \ | ||||
|     --allow-risky=yes | ||||
|   | ||||
| @@ -1,9 +1,10 @@ | ||||
| parameters: | ||||
|   scanFiles: | ||||
|     - ../_ide_helper_models.php | ||||
|   universalObjectCratesClasses: | ||||
|     - Illuminate\Database\Eloquent\Model | ||||
|   # TODO: slowly remove these parameters and fix the issues found. | ||||
|   reportUnmatchedIgnoredErrors: false | ||||
|   checkGenericClassInNonGenericObjectType: false  # remove this rule when all other issues are solved. | ||||
|   ignoreErrors: | ||||
|   # TODO: slowly remove these exceptions and fix the issues found. | ||||
|     - '#Dynamic call to static method#' # all the Laravel ORM things depend on this. | ||||
| @@ -11,6 +12,7 @@ parameters: | ||||
|     - '#with no value type specified in iterable type array#' # remove this rule when all other issues are solved. | ||||
|     - '#has no value type specified in iterable type array#' # remove this rule when all other issues are solved. | ||||
|     - '#is not allowed to extend#' | ||||
|     - '#does not specify its types#' | ||||
|     - '#switch is forbidden to use#' | ||||
|     - '#is neither abstract nor final#' | ||||
|     - '#on left side of \?\?\= always exists and is not nullable#' | ||||
|   | ||||
| @@ -176,6 +176,7 @@ MAILGUN_ENDPOINT=api.mailgun.net | ||||
| # If you use Docker or similar, you can set these variables from a file by appending them with _FILE | ||||
| MANDRILL_SECRET= | ||||
| SPARKPOST_SECRET= | ||||
| MAILERSEND_API_KEY= | ||||
|  | ||||
| # Firefly III can send you the following messages. | ||||
| SEND_ERROR_MESSAGE=true | ||||
| @@ -312,6 +313,12 @@ PUSHER_ID= | ||||
| DEMO_USERNAME= | ||||
| DEMO_PASSWORD= | ||||
|  | ||||
| # | ||||
| # Disable or enable the running balance column data | ||||
| # Please disable this. It's a very experimental feature. | ||||
| # | ||||
| USE_RUNNING_BALANCE=false | ||||
|  | ||||
| # | ||||
| # The v2 layout is very experimental. If it breaks you get to keep both parts. | ||||
| # Be wary of data loss. | ||||
|   | ||||
							
								
								
									
										3
									
								
								.github/dependabot.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/dependabot.yml
									
									
									
									
										vendored
									
									
								
							| @@ -4,6 +4,7 @@ updates: | ||||
|   # Check for updates to GitHub Actions every week | ||||
|   - package-ecosystem: "github-actions" | ||||
|     directory: "/" | ||||
|     labels: [] | ||||
|     schedule: | ||||
|       interval: "weekly" | ||||
|  | ||||
| @@ -11,6 +12,7 @@ updates: | ||||
|   - package-ecosystem: "composer" | ||||
|     directory: "/" # Location of package manifests | ||||
|     target-branch: develop | ||||
|     labels: [] | ||||
|     versioning-strategy: increase | ||||
|     schedule: | ||||
|       interval: "weekly" | ||||
| @@ -18,6 +20,7 @@ updates: | ||||
|   # yarn / JS updates | ||||
|   - package-ecosystem: "npm" | ||||
|     directory: "/" | ||||
|     labels: [] | ||||
|     target-branch: develop | ||||
|     versioning-strategy: increase | ||||
|     schedule: | ||||
|   | ||||
							
								
								
									
										2
									
								
								.github/label-actions.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/label-actions.yml
									
									
									
									
										vendored
									
									
								
							| @@ -4,6 +4,7 @@ | ||||
| feature: | ||||
|   issues: | ||||
|     # Post a comment, `{issue-author}` is an optional placeholder | ||||
|     unlabel: feature | ||||
|     comment: | | ||||
|       Hi there!  | ||||
|  | ||||
| @@ -32,6 +33,7 @@ epic: | ||||
|       Thank you for your contributions. | ||||
|  | ||||
| enhancement: | ||||
|   unlabel: enhancement | ||||
|   issues: | ||||
|     # Post a comment, `{issue-author}` is an optional placeholder | ||||
|     comment: | | ||||
|   | ||||
							
								
								
									
										1
									
								
								.github/pull_request_template.md
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/pull_request_template.md
									
									
									
									
										vendored
									
									
								
							| @@ -6,6 +6,7 @@ Thank you for submitting new code to Firefly III, or any of the related projects | ||||
| - Please do not open PRs to "discuss" possible solutions or to "get feedback" on your code. I simply don't have time for that. | ||||
| - Pull requests for the MAIN branch will be closed. | ||||
| - DO NOT include translated strings in your PR. | ||||
| - PRs (or parts thereof) that only fix issues inside code comments will not be accepted. | ||||
| 
 | ||||
| If it feels necessary to open an issue first, please do so, before you open a PR. | ||||
| 
 | ||||
|   | ||||
							
								
								
									
										2
									
								
								.github/workflows/close-duplicates.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/close-duplicates.yml
									
									
									
									
										vendored
									
									
								
							| @@ -13,7 +13,7 @@ jobs: | ||||
|   close_duplicates: | ||||
|     runs-on: ubuntu-latest | ||||
|     steps: | ||||
|       - uses: github/command@v1.2.0 | ||||
|       - uses: github/command@v1.3.0 | ||||
|         id: command | ||||
|         with: | ||||
|           allowed_contexts: "issue" | ||||
|   | ||||
							
								
								
									
										93
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										93
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -4,9 +4,13 @@ on: | ||||
|   workflow_dispatch: | ||||
|     inputs: | ||||
|       version: | ||||
|         description: 'Release "v1.2.3" or "develop"' | ||||
|         description: 'Release "v1.2.3" or "develop" or "branch-abc"' | ||||
|         required: true | ||||
|         default: 'develop' | ||||
|       phpversion: | ||||
|         description: 'PHP version' | ||||
|         required: true | ||||
|         default: '8.3' | ||||
|   schedule: | ||||
|     - cron: '0 3 * * MON' | ||||
|  | ||||
| @@ -23,6 +27,11 @@ jobs: | ||||
|           if [[ "develop" == "$version" ]]; then | ||||
|             git checkout --track origin/develop | ||||
|             git pull | ||||
|           elif [[ "$version" == branch* ]]; then | ||||
|             PULLBRANCH=${version:7} | ||||
|             echo "The branch is '$PULLBRANCH' ($version)" | ||||
|             git checkout --track origin/$PULLBRANCH | ||||
|             git pull | ||||
|           else | ||||
|             git config user.name github-actions | ||||
|             git config user.email 41898282+github-actions[bot]@users.noreply.github.com | ||||
| @@ -36,7 +45,7 @@ jobs: | ||||
|       - name: Setup PHP | ||||
|         uses: shivammathur/setup-php@v2 | ||||
|         with: | ||||
|           php-version: '8.3' | ||||
|           php-version: ${{ github.event.inputs.phpversion }} | ||||
|           extensions: mbstring, intl, zip, bcmath | ||||
|       - name: crowdin action | ||||
|         uses: crowdin/github-action@v2 | ||||
| @@ -133,7 +142,7 @@ jobs: | ||||
|           rm -rf vendor composer.lock | ||||
|           composer update --no-dev --no-scripts --no-plugins -q | ||||
|           sudo chown -R runner:docker resources/lang | ||||
|           .ci/phpcs.sh | ||||
|           .ci/phpcs.sh || true | ||||
|       - name: Import GPG key | ||||
|         uses: crazy-max/ghaction-import-gpg@v6 | ||||
|         with: | ||||
| @@ -166,6 +175,16 @@ jobs: | ||||
|             tarName=FireflyIII-develop.tar.gz | ||||
|           fi | ||||
|  | ||||
|           # if this is a branch build, also slightly different variable names. | ||||
|           if [[ "$version" == branch* ]]; then | ||||
|             [[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0; | ||||
|             # branch builds overrule develop | ||||
|             releaseName=$version-$(date +'%Y%m%d') | ||||
|             originalName=$releaseName | ||||
|             zipName=FireflyIII-$version.zip | ||||
|             tarName=FireflyIII-$version.tar.gz | ||||
|           fi | ||||
|  | ||||
|           # in both cases, if the release or tag already exists, add ".1" until it no longer exists. | ||||
|           tagFound=true | ||||
|           tagCount=1 | ||||
| @@ -207,12 +226,13 @@ jobs: | ||||
|           gpg --armor --detach-sign $zipName | ||||
|           gpg --armor --detach-sign $tarName | ||||
|  | ||||
|           # create a development (nightly) release: | ||||
|           # describe the development release. | ||||
|           if [[ "develop" == "$version" ]]; then | ||||
|             echo 'Develop release.' | ||||
|             # add text to output.txt (instructions) | ||||
|             rm output.txt | ||||
|             echo "Bi-weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt | ||||
|             touch output.txt | ||||
|             sudo chown -R runner:docker output.txt | ||||
|             echo "Weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt | ||||
|             echo "" >> output.txt | ||||
|             echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt | ||||
|             echo "" >> output.txt | ||||
| @@ -220,15 +240,62 @@ jobs: | ||||
|             echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt | ||||
|             echo "" >> output.txt | ||||
|             echo ":warning: Please be careful with this pre-release, as it may not work as expected." >> output.txt | ||||
|           fi | ||||
|           # describe a branch release | ||||
|           if [[ "$version" == branch* ]]; then | ||||
|             echo 'Branch release.' | ||||
|             rm output.txt | ||||
|             touch output.txt | ||||
|             sudo chown -R runner:docker output.txt | ||||
|             echo "Irregular BRANCH release of Firefly III. This release contains specific features or changes. Docker users can find this release under the \`$version\` tag." >> output.txt | ||||
|             echo "" >> output.txt | ||||
|             echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt | ||||
|             echo "" >> output.txt | ||||
|             echo "* Please read the installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt | ||||
|             echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt | ||||
|             echo "" >> output.txt | ||||
|             echo ":warning: Please be careful with this branch pre-release, as it may not work as expected." >> output.txt | ||||
|           fi | ||||
|           # describe the main release | ||||
|           if [[ "develop" != "$version" ]] && [[ "$version" != branch* ]]; then | ||||
|             sudo chown -R runner:docker output.txt | ||||
|             echo 'Main release.' | ||||
|             echo '' >> output.txt | ||||
|             echo '### Instructions' >> output.txt | ||||
|             echo '' >> output.txt | ||||
|             echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt | ||||
|             echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt | ||||
|             echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt | ||||
|  | ||||
|           fi | ||||
|  | ||||
|           # create a development release: | ||||
|           if [[ "develop" == "$version" ]]; then | ||||
|             # create the release: | ||||
|             echo "Create nightly release." | ||||
|             git tag -a $releaseName -m "Nightly development release '$version' on $(date +'%Y-%m-%d')" | ||||
|             echo "Create develop release." | ||||
|             git tag -a $releaseName -m "Development release '$version' on $(date +'%Y-%m-%d')" | ||||
|  | ||||
|             git push origin $releaseName | ||||
|             gh release create $releaseName -p --verify-tag \ | ||||
|               -t "Development release for $(date +'%Y-%m-%d')" \ | ||||
|               -F output.txt | ||||
|           fi | ||||
|  | ||||
|           # create a branch release: | ||||
|           if [[ "$version" == branch* ]]; then | ||||
|  | ||||
|             # create the release: | ||||
|             echo "Create branch release." | ||||
|             git tag -a $releaseName -m "Branch release '$version' on $(date +'%Y-%m-%d')" | ||||
|  | ||||
|             git push origin $releaseName | ||||
|             gh release create $releaseName -p --verify-tag \ | ||||
|               -t "Branch release for $(date +'%Y-%m-%d')" \ | ||||
|               -F output.txt | ||||
|           fi | ||||
|  | ||||
|           # create a development (nightly) release: | ||||
|           if [[ "develop" == "$version" ]] || [[ "$version" == branch* ]]; then | ||||
|             # add zip file to release. | ||||
|             gh release upload $releaseName $zipName | ||||
|             gh release upload $releaseName $tarName | ||||
| @@ -247,16 +314,6 @@ jobs: | ||||
|             gh release upload $releaseName HEAD.txt | ||||
|           else | ||||
|             echo 'MAIN (real) release' | ||||
|             sudo chown -R runner:docker output.txt | ||||
|             # add text to output.txt (more instructions) | ||||
|             echo '' >> output.txt | ||||
|             echo '### Instructions' >> output.txt | ||||
|             echo '' >> output.txt | ||||
|             echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt | ||||
|             echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt | ||||
|             echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt | ||||
|  | ||||
|             echo "Create default release." | ||||
|             git tag -a $releaseName -m "Here be changelog" | ||||
|             git push origin $releaseName | ||||
|             gh release create $releaseName -F output.txt -t "$releaseName" --verify-tag | ||||
|   | ||||
							
								
								
									
										4
									
								
								.github/workflows/stale.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/stale.yml
									
									
									
									
										vendored
									
									
								
							| @@ -12,6 +12,7 @@ jobs: | ||||
|     permissions: | ||||
|       issues: write  # for actions/stale to close stale issues | ||||
|       pull-requests: write  # for actions/stale to close stale PRs | ||||
|       actions: write | ||||
|     runs-on: ubuntu-latest | ||||
|     steps: | ||||
|       - uses: actions/stale@v9 | ||||
| @@ -35,4 +36,5 @@ jobs: | ||||
|             Thank you for your contributions. | ||||
|           days-before-stale: 14 | ||||
|           days-before-close: 7 | ||||
|           exempt-issue-labels: 'enhancement,feature,bug,announcement,epic,triage' | ||||
|           exempt-all-milestones: true | ||||
|           exempt-issue-labels: 'triage' | ||||
|   | ||||
| @@ -4,6 +4,12 @@ Over time, many people have contributed to Firefly III. Their efforts are not al | ||||
| Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution. | ||||
| 
 | ||||
| ## 2024 | ||||
| - Antônio Franco | ||||
| - yparitcher | ||||
| - Jhon Pedroza | ||||
| - mzhubail | ||||
| - tasnim | ||||
| - withbest | ||||
| - Steve Wasiura | ||||
| - imlonghao | ||||
| - Rahman Yusuf | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /** | ||||
|  * AccountController.php | ||||
|  * Copyright (c) 2020 james@firefly-iii.org | ||||
| @@ -29,6 +30,7 @@ use FireflyIII\Exceptions\FireflyException; | ||||
| use FireflyIII\Models\Account; | ||||
| use FireflyIII\Models\AccountType; | ||||
| use FireflyIII\Repositories\Account\AccountRepositoryInterface; | ||||
| use FireflyIII\Support\Facades\Steam; | ||||
| use FireflyIII\Support\Http\Api\AccountFilter; | ||||
| use FireflyIII\User; | ||||
| use Illuminate\Http\JsonResponse; | ||||
| @@ -77,7 +79,7 @@ class AccountController extends Controller | ||||
|         $query           = $data['query']; | ||||
|         $date            = $data['date'] ?? today(config('app.timezone')); | ||||
|         $return          = []; | ||||
|         $result          = $this->repository->searchAccount((string)$query, $types, $this->parameters->get('limit')); | ||||
|         $result          = $this->repository->searchAccount((string) $query, $types, $this->parameters->get('limit')); | ||||
| 
 | ||||
|         // TODO this code is duplicated in the V2 Autocomplete controller, which means this code is due to be deprecated.
 | ||||
|         $defaultCurrency = app('amount')->getDefaultCurrency(); | ||||
| @@ -88,20 +90,20 @@ class AccountController extends Controller | ||||
|             $currency        = $this->repository->getAccountCurrency($account) ?? $defaultCurrency; | ||||
| 
 | ||||
|             if (in_array($account->accountType->type, $this->balanceTypes, true)) { | ||||
|                 $balance         = app('steam')->balance($account, $date); | ||||
|                 $balance         = Steam::finalAccountBalance($account, $date); | ||||
|                 $nameWithBalance = sprintf( | ||||
|                     '%s (%s)', | ||||
|                     $account->name, | ||||
|                     app('amount')->formatAnything($currency, $balance, false) | ||||
|                     app('amount')->formatAnything($currency, $balance['balance'], false) | ||||
|                 ); | ||||
|             } | ||||
| 
 | ||||
|             $return[]        = [ | ||||
|                 'id'                      => (string)$account->id, | ||||
|                 'id'                      => (string) $account->id, | ||||
|                 'name'                    => $account->name, | ||||
|                 'name_with_balance'       => $nameWithBalance, | ||||
|                 'type'                    => $account->accountType->type, | ||||
|                 'currency_id'             => (string)$currency->id, | ||||
|                 'currency_id'             => (string) $currency->id, | ||||
|                 'currency_name'           => $currency->name, | ||||
|                 'currency_code'           => $currency->code, | ||||
|                 'currency_symbol'         => $currency->symbol, | ||||
| @@ -114,8 +116,8 @@ class AccountController extends Controller | ||||
|             $return, | ||||
|             static function (array $left, array $right) { | ||||
|                 $order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE]; | ||||
|                 $posA  = (int)array_search($left['type'], $order, true); | ||||
|                 $posB  = (int)array_search($right['type'], $order, true); | ||||
|                 $posA  = (int) array_search($left['type'], $order, true); | ||||
|                 $posB  = (int) array_search($right['type'], $order, true); | ||||
| 
 | ||||
|                 return $posA - $posB; | ||||
|             } | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /** | ||||
|  * BillController.php | ||||
|  * Copyright (c) 2020 james@firefly-iii.org | ||||
| @@ -66,7 +67,7 @@ class BillController extends Controller | ||||
|         $filtered = $result->map( | ||||
|             static function (Bill $item) { | ||||
|                 return [ | ||||
|                     'id'     => (string)$item->id, | ||||
|                     'id'     => (string) $item->id, | ||||
|                     'name'   => $item->name, | ||||
|                     'active' => $item->active, | ||||
|                 ]; | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /** | ||||
|  * BudgetController.php | ||||
|  * Copyright (c) 2020 james@firefly-iii.org | ||||
| @@ -66,7 +67,7 @@ class BudgetController extends Controller | ||||
|         $filtered = $result->map( | ||||
|             static function (Budget $item) { | ||||
|                 return [ | ||||
|                     'id'   => (string)$item->id, | ||||
|                     'id'   => (string) $item->id, | ||||
|                     'name' => $item->name, | ||||
|                 ]; | ||||
|             } | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /** | ||||
|  * CategoryController.php | ||||
|  * Copyright (c) 2020 james@firefly-iii.org | ||||
| @@ -66,7 +67,7 @@ class CategoryController extends Controller | ||||
|         $filtered = $result->map( | ||||
|             static function (Category $item) { | ||||
|                 return [ | ||||
|                     'id'   => (string)$item->id, | ||||
|                     'id'   => (string) $item->id, | ||||
|                     'name' => $item->name, | ||||
|                 ]; | ||||
|             } | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /** | ||||
|  * CurrencyController.php | ||||
|  * Copyright (c) 2020 james@firefly-iii.org | ||||
| @@ -68,7 +69,7 @@ class CurrencyController extends Controller | ||||
|         /** @var TransactionCurrency $currency */ | ||||
|         foreach ($collection as $currency) { | ||||
|             $result[] = [ | ||||
|                 'id'             => (string)$currency->id, | ||||
|                 'id'             => (string) $currency->id, | ||||
|                 'name'           => $currency->name, | ||||
|                 'code'           => $currency->code, | ||||
|                 'symbol'         => $currency->symbol, | ||||
| @@ -94,7 +95,7 @@ class CurrencyController extends Controller | ||||
|         /** @var TransactionCurrency $currency */ | ||||
|         foreach ($collection as $currency) { | ||||
|             $result[] = [ | ||||
|                 'id'             => (string)$currency->id, | ||||
|                 'id'             => (string) $currency->id, | ||||
|                 'name'           => sprintf('%s (%s)', $currency->name, $currency->code), | ||||
|                 'code'           => $currency->code, | ||||
|                 'symbol'         => $currency->symbol, | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /** | ||||
|  * ObjectGroupController.php | ||||
|  * Copyright (c) 2020 james@firefly-iii.org | ||||
| @@ -68,7 +69,7 @@ class ObjectGroupController extends Controller | ||||
|         /** @var ObjectGroup $objectGroup */ | ||||
|         foreach ($result as $objectGroup) { | ||||
|             $return[] = [ | ||||
|                 'id'    => (string)$objectGroup->id, | ||||
|                 'id'    => (string) $objectGroup->id, | ||||
|                 'name'  => $objectGroup->title, | ||||
|                 'title' => $objectGroup->title, | ||||
|             ]; | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /** | ||||
|  * PiggyBankController.php | ||||
|  * Copyright (c) 2020 james@firefly-iii.org | ||||
| @@ -67,22 +68,21 @@ class PiggyBankController extends Controller | ||||
|     { | ||||
|         $data     = $request->getData(); | ||||
|         $piggies  = $this->piggyRepository->searchPiggyBank($data['query'], $this->parameters->get('limit')); | ||||
|         $defaultCurrency = app('amount')->getDefaultCurrency(); | ||||
|         $response = []; | ||||
| 
 | ||||
|         /** @var PiggyBank $piggy */ | ||||
|         foreach ($piggies as $piggy) { | ||||
|             $currency    = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency; | ||||
|             $currency    = $piggy->transactionCurrency; | ||||
|             $objectGroup = $piggy->objectGroups()->first(); | ||||
|             $response[]  = [ | ||||
|                 'id'                      => (string)$piggy->id, | ||||
|                 'id'                      => (string) $piggy->id, | ||||
|                 'name'                    => $piggy->name, | ||||
|                 'currency_id'             => (string)$currency->id, | ||||
|                 'currency_id'             => (string) $currency->id, | ||||
|                 'currency_name'           => $currency->name, | ||||
|                 'currency_code'           => $currency->code, | ||||
|                 'currency_symbol'         => $currency->symbol, | ||||
|                 'currency_decimal_places' => $currency->decimal_places, | ||||
|                 'object_group_id'         => null === $objectGroup ? null : (string)$objectGroup->id, | ||||
|                 'object_group_id'         => null === $objectGroup ? null : (string) $objectGroup->id, | ||||
|                 'object_group_title'      => $objectGroup?->title, | ||||
|             ]; | ||||
|         } | ||||
| @@ -98,29 +98,28 @@ class PiggyBankController extends Controller | ||||
|     { | ||||
|         $data     = $request->getData(); | ||||
|         $piggies  = $this->piggyRepository->searchPiggyBank($data['query'], $this->parameters->get('limit')); | ||||
|         $defaultCurrency = app('amount')->getDefaultCurrency(); | ||||
|         $response = []; | ||||
| 
 | ||||
|         /** @var PiggyBank $piggy */ | ||||
|         foreach ($piggies as $piggy) { | ||||
|             $currency      = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency; | ||||
|             $currentAmount = $this->piggyRepository->getRepetition($piggy)->currentamount ?? '0'; | ||||
|             $currency      = $piggy->transactionCurrency; | ||||
|             $currentAmount = $this->piggyRepository->getCurrentAmount($piggy); | ||||
|             $objectGroup   = $piggy->objectGroups()->first(); | ||||
|             $response[]    = [ | ||||
|                 'id'                      => (string)$piggy->id, | ||||
|                 'id'                      => (string) $piggy->id, | ||||
|                 'name'                    => $piggy->name, | ||||
|                 'name_with_balance'       => sprintf( | ||||
|                     '%s (%s / %s)', | ||||
|                     $piggy->name, | ||||
|                     app('amount')->formatAnything($currency, $currentAmount, false), | ||||
|                     app('amount')->formatAnything($currency, $piggy->targetamount, false), | ||||
|                     app('amount')->formatAnything($currency, $piggy->target_amount, false), | ||||
|                 ), | ||||
|                 'currency_id'             => (string)$currency->id, | ||||
|                 'currency_id'             => (string) $currency->id, | ||||
|                 'currency_name'           => $currency->name, | ||||
|                 'currency_code'           => $currency->code, | ||||
|                 'currency_symbol'         => $currency->symbol, | ||||
|                 'currency_decimal_places' => $currency->decimal_places, | ||||
|                 'object_group_id'         => null === $objectGroup ? null : (string)$objectGroup->id, | ||||
|                 'object_group_id'         => null === $objectGroup ? null : (string) $objectGroup->id, | ||||
|                 'object_group_title'      => $objectGroup?->title, | ||||
|             ]; | ||||
|         } | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /** | ||||
|  * RecurrenceController.php | ||||
|  * Copyright (c) 2020 james@firefly-iii.org | ||||
| @@ -66,7 +67,7 @@ class RecurrenceController extends Controller | ||||
|         /** @var Recurrence $recurrence */ | ||||
|         foreach ($recurrences as $recurrence) { | ||||
|             $response[] = [ | ||||
|                 'id'          => (string)$recurrence->id, | ||||
|                 'id'          => (string) $recurrence->id, | ||||
|                 'name'        => $recurrence->title, | ||||
|                 'description' => $recurrence->description, | ||||
|             ]; | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /** | ||||
|  * RuleController.php | ||||
|  * Copyright (c) 2020 james@firefly-iii.org | ||||
| @@ -65,7 +66,7 @@ class RuleController extends Controller | ||||
|         /** @var Rule $rule */ | ||||
|         foreach ($rules as $rule) { | ||||
|             $response[] = [ | ||||
|                 'id'          => (string)$rule->id, | ||||
|                 'id'          => (string) $rule->id, | ||||
|                 'name'        => $rule->title, | ||||
|                 'description' => $rule->description, | ||||
|             ]; | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /** | ||||
|  * RuleGroupController.php | ||||
|  * Copyright (c) 2020 james@firefly-iii.org | ||||
| @@ -65,7 +66,7 @@ class RuleGroupController extends Controller | ||||
|         /** @var RuleGroup $group */ | ||||
|         foreach ($groups as $group) { | ||||
|             $response[] = [ | ||||
|                 'id'          => (string)$group->id, | ||||
|                 'id'          => (string) $group->id, | ||||
|                 'name'        => $group->title, | ||||
|                 'description' => $group->description, | ||||
|             ]; | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /** | ||||
|  * TagController.php | ||||
|  * Copyright (c) 2020 james@firefly-iii.org | ||||
| @@ -68,7 +69,7 @@ class TagController extends Controller | ||||
|         /** @var Tag $tag */ | ||||
|         foreach ($result as $tag) { | ||||
|             $array[] = [ | ||||
|                 'id'   => (string)$tag->id, | ||||
|                 'id'   => (string) $tag->id, | ||||
|                 'name' => $tag->tag, | ||||
|                 'tag'  => $tag->tag, | ||||
|             ]; | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /** | ||||
|  * TransactionController.php | ||||
|  * Copyright (c) 2020 james@firefly-iii.org | ||||
| @@ -76,8 +77,8 @@ class TransactionController extends Controller | ||||
|         /** @var TransactionJournal $journal */ | ||||
|         foreach ($filtered as $journal) { | ||||
|             $array[] = [ | ||||
|                 'id'                   => (string)$journal->id, | ||||
|                 'transaction_group_id' => (string)$journal->transaction_group_id, | ||||
|                 'id'                   => (string) $journal->id, | ||||
|                 'transaction_group_id' => (string) $journal->transaction_group_id, | ||||
|                 'name'                 => $journal->description, | ||||
|                 'description'          => $journal->description, | ||||
|             ]; | ||||
| @@ -96,7 +97,7 @@ class TransactionController extends Controller | ||||
|         $result = new Collection(); | ||||
|         if (is_numeric($data['query'])) { | ||||
|             // search for group, not journal.
 | ||||
|             $firstResult = $this->groupRepository->find((int)$data['query']); | ||||
|             $firstResult = $this->groupRepository->find((int) $data['query']); | ||||
|             if (null !== $firstResult) { | ||||
|                 // group may contain multiple journals, each a result:
 | ||||
|                 foreach ($firstResult->transactionJournals as $journal) { | ||||
| @@ -114,8 +115,8 @@ class TransactionController extends Controller | ||||
|         /** @var TransactionJournal $journal */ | ||||
|         foreach ($result as $journal) { | ||||
|             $array[] = [ | ||||
|                 'id'                   => (string)$journal->id, | ||||
|                 'transaction_group_id' => (string)$journal->transaction_group_id, | ||||
|                 'id'                   => (string) $journal->id, | ||||
|                 'transaction_group_id' => (string) $journal->transaction_group_id, | ||||
|                 'name'                 => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description), | ||||
|                 'description'          => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description), | ||||
|             ]; | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /** | ||||
|  * TransactionTypeController.php | ||||
|  * Copyright (c) 2020 james@firefly-iii.org | ||||
| @@ -65,7 +66,7 @@ class TransactionTypeController extends Controller | ||||
|         foreach ($types as $type) { | ||||
|             // different key for consistency.
 | ||||
|             $array[] = [ | ||||
|                 'id'   => (string)$type->id, | ||||
|                 'id'   => (string) $type->id, | ||||
|                 'name' => $type->type, | ||||
|                 'type' => $type->type, | ||||
|             ]; | ||||
|   | ||||
| @@ -104,7 +104,7 @@ class AccountController extends Controller | ||||
|             } | ||||
|             $currentSet   = [ | ||||
|                 'label'                   => $account->name, | ||||
|                 'currency_id'             => (string)$currency->id, | ||||
|                 'currency_id'             => (string) $currency->id, | ||||
|                 'currency_code'           => $currency->code, | ||||
|                 'currency_symbol'         => $currency->symbol, | ||||
|                 'currency_decimal_places' => $currency->decimal_places, | ||||
| @@ -116,13 +116,13 @@ class AccountController extends Controller | ||||
|             ]; | ||||
|             // TODO this code is also present in the V2 chart account controller so this method is due to be deprecated.
 | ||||
|             $currentStart = clone $start; | ||||
|             $range        = app('steam')->balanceInRange($account, $start, clone $end); | ||||
|             $range        = app('steam')->finalAccountBalanceInRange($account, $start, clone $end, $this->convertToNative); | ||||
|             // 2022-10-11 this method no longer converts to float.
 | ||||
|             $previous     = array_values($range)[0]; | ||||
|             while ($currentStart <= $end) { | ||||
|                 $format                        = $currentStart->format('Y-m-d'); | ||||
|                 $label                         = $currentStart->toAtomString(); | ||||
|                 $balance                       = array_key_exists($format, $range) ? $range[$format] : $previous; | ||||
|                 $balance                       = array_key_exists($format, $range) ? $range[$format]['balance'] : $previous; | ||||
|                 $previous                      = $balance; | ||||
|                 $currentStart->addDay(); | ||||
|                 $currentSet['entries'][$label] = $balance; | ||||
|   | ||||
| @@ -55,6 +55,7 @@ abstract class Controller extends BaseController | ||||
|     /** @var array<int, string> */ | ||||
|     protected array        $allowedSort; | ||||
|     protected ParameterBag $parameters; | ||||
|     protected bool        $convertToNative = false; | ||||
| 
 | ||||
|     /** | ||||
|      * Controller constructor. | ||||
| @@ -68,7 +69,9 @@ abstract class Controller extends BaseController | ||||
|                 $this->parameters = $this->getParameters(); | ||||
|                 if (auth()->check()) { | ||||
|                     $language              = app('steam')->getLanguage(); | ||||
|                     $this->convertToNative = app('preferences')->get('convert_to_native', false)->data; | ||||
|                     app()->setLocale($language); | ||||
| 
 | ||||
|                 } | ||||
| 
 | ||||
|                 return $next($request); | ||||
| @@ -82,7 +85,7 @@ abstract class Controller extends BaseController | ||||
|     private function getParameters(): ParameterBag | ||||
|     { | ||||
|         $bag      = new ParameterBag(); | ||||
|         $page     = (int)request()->get('page'); | ||||
|         $page     = (int) request()->get('page'); | ||||
|         if ($page < 1) { | ||||
|             $page = 1; | ||||
|         } | ||||
| @@ -107,13 +110,13 @@ abstract class Controller extends BaseController | ||||
|             $obj  = null; | ||||
|             if (null !== $date) { | ||||
|                 try { | ||||
|                     $obj = Carbon::parse((string)$date); | ||||
|                     $obj = Carbon::parse((string) $date); | ||||
|                 } catch (InvalidDateException|InvalidFormatException $e) { | ||||
|                     // don't care
 | ||||
|                     app('log')->warning( | ||||
|                         sprintf( | ||||
|                             'Ignored invalid date "%s" in API controller parameter check: %s', | ||||
|                             substr((string)$date, 0, 20), | ||||
|                             substr((string) $date, 0, 20), | ||||
|                             $e->getMessage() | ||||
|                         ) | ||||
|                     ); | ||||
| @@ -134,7 +137,7 @@ abstract class Controller extends BaseController | ||||
|                 $value = null; | ||||
|             } | ||||
|             if (null !== $value) { | ||||
|                 $bag->set($integer, (int)$value); | ||||
|                 $bag->set($integer, (int) $value); | ||||
|             } | ||||
|             if (null === $value | ||||
|                 && 'limit' === $integer // @phpstan-ignore-line
 | ||||
| @@ -144,7 +147,7 @@ abstract class Controller extends BaseController | ||||
|                 $user     = auth()->user(); | ||||
| 
 | ||||
|                 /** @var Preference $pageSize */ | ||||
|                 $pageSize = (int)app('preferences')->getForUser($user, 'listPageSize', 50)->data; | ||||
|                 $pageSize = (int) app('preferences')->getForUser($user, 'listPageSize', 50)->data; | ||||
|                 $bag->set($integer, $pageSize); | ||||
|             } | ||||
|         } | ||||
| @@ -158,7 +161,7 @@ abstract class Controller extends BaseController | ||||
|         $sortParameters = []; | ||||
| 
 | ||||
|         try { | ||||
|             $param = (string)request()->query->get('sort'); | ||||
|             $param = (string) request()->query->get('sort'); | ||||
|         } catch (BadRequestException $e) { | ||||
|             app('log')->error('Request field "sort" contains a non-scalar value. Value set to NULL.'); | ||||
|             app('log')->error($e->getMessage()); | ||||
|   | ||||
| @@ -70,8 +70,8 @@ class TransactionController extends Controller | ||||
|         // to respond to what is in the $query.
 | ||||
|         // this is OK because only one thing can be in the query at the moment.
 | ||||
|         if ($this->isUpdateTransactionAccount($params)) { | ||||
|             $original    = $this->repository->find((int)$params['where']['account_id']); | ||||
|             $destination = $this->repository->find((int)$params['update']['account_id']); | ||||
|             $original    = $this->repository->find((int) $params['where']['account_id']); | ||||
|             $destination = $this->repository->find((int) $params['update']['account_id']); | ||||
| 
 | ||||
|             /** @var AccountDestroyService $service */ | ||||
|             $service     = app(AccountDestroyService::class); | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * DestroyController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
| @@ -25,11 +26,11 @@ namespace FireflyIII\Api\V1\Controllers\Data; | ||||
| 
 | ||||
| use FireflyIII\Api\V1\Controllers\Controller; | ||||
| use FireflyIII\Api\V1\Requests\Data\DestroyRequest; | ||||
| use FireflyIII\Enums\TransactionTypeEnum; | ||||
| use FireflyIII\Exceptions\FireflyException; | ||||
| use FireflyIII\Models\Account; | ||||
| use FireflyIII\Models\AccountType; | ||||
| use FireflyIII\Models\TransactionJournal; | ||||
| use FireflyIII\Models\TransactionType; | ||||
| use FireflyIII\Repositories\Account\AccountRepositoryInterface; | ||||
| use FireflyIII\Repositories\Bill\BillRepositoryInterface; | ||||
| use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface; | ||||
| @@ -68,7 +69,7 @@ class DestroyController extends Controller | ||||
|         $allExceptAssets = [AccountType::BENEFICIARY, AccountType::CASH, AccountType::CREDITCARD, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::IMPORT, AccountType::INITIAL_BALANCE, AccountType::LIABILITY_CREDIT, AccountType::RECONCILIATION, AccountType::REVENUE]; | ||||
|         $all             = [AccountType::ASSET, AccountType::BENEFICIARY, AccountType::CASH, AccountType::CREDITCARD, AccountType::DEBT, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::IMPORT, AccountType::INITIAL_BALANCE, AccountType::LIABILITY_CREDIT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::RECONCILIATION]; | ||||
|         $liabilities     = [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD]; | ||||
|         $transactions    = [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER, TransactionType::RECONCILIATION]; | ||||
|         $transactions    = [TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::TRANSFER->value, TransactionTypeEnum::RECONCILIATION->value]; | ||||
| 
 | ||||
|         match ($objects) { | ||||
|             'budgets'                => $this->destroyBudgets(), | ||||
| @@ -86,9 +87,9 @@ class DestroyController extends Controller | ||||
|             'revenue_accounts'       => $this->destroyAccounts([AccountType::REVENUE]), | ||||
|             'liabilities'            => $this->destroyAccounts($liabilities), | ||||
|             'transactions'           => $this->destroyTransactions($transactions), | ||||
|             'withdrawals'            => $this->destroyTransactions([TransactionType::WITHDRAWAL]), | ||||
|             'deposits'               => $this->destroyTransactions([TransactionType::DEPOSIT]), | ||||
|             'transfers'              => $this->destroyTransactions([TransactionType::TRANSFER]), | ||||
|             'withdrawals'            => $this->destroyTransactions([TransactionTypeEnum::WITHDRAWAL->value]), | ||||
|             'deposits'               => $this->destroyTransactions([TransactionTypeEnum::DEPOSIT->value]), | ||||
|             'transfers'              => $this->destroyTransactions([TransactionTypeEnum::TRANSFER->value]), | ||||
|             default                  => throw new FireflyException(sprintf('200033: This endpoint can\'t handle object "%s"', $objects)), | ||||
|         }; | ||||
| 
 | ||||
|   | ||||
| @@ -88,7 +88,7 @@ class ExportController extends Controller | ||||
|             ->header('Expires', '0') | ||||
|             ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0') | ||||
|             ->header('Pragma', 'public') | ||||
|             ->header('Content-Length', (string)strlen($data[$key])) | ||||
|             ->header('Content-Length', (string) strlen($data[$key])) | ||||
|         ; | ||||
| 
 | ||||
|         return $response; | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * PurgeController.php | ||||
|  * Copyright (c) 2022 james@firefly-iii.org | ||||
| @@ -28,13 +29,13 @@ use FireflyIII\Models\Account; | ||||
| use FireflyIII\Models\Bill; | ||||
| use FireflyIII\Models\Budget; | ||||
| use FireflyIII\Models\Category; | ||||
| use FireflyIII\Models\PiggyBank; | ||||
| use FireflyIII\Models\Recurrence; | ||||
| use FireflyIII\Models\Rule; | ||||
| use FireflyIII\Models\RuleGroup; | ||||
| use FireflyIII\Models\Tag; | ||||
| use FireflyIII\Models\TransactionGroup; | ||||
| use FireflyIII\Models\TransactionJournal; | ||||
| use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; | ||||
| use FireflyIII\User; | ||||
| use Illuminate\Http\JsonResponse; | ||||
| 
 | ||||
| @@ -62,14 +63,17 @@ class PurgeController extends Controller | ||||
|         Bill::whereUserId($user->id)->onlyTrashed()->forceDelete(); | ||||
| 
 | ||||
|         // piggies
 | ||||
|         $set  = PiggyBank::leftJoin('accounts', 'accounts.id', 'piggy_banks.account_id') | ||||
|             ->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*']) | ||||
|         ; | ||||
| 
 | ||||
|         /** @var PiggyBank $piggy */ | ||||
|         foreach ($set as $piggy) { | ||||
|             $piggy->forceDelete(); | ||||
|         } | ||||
|         $repository = app(PiggyBankRepositoryInterface::class); | ||||
|         $repository->setUser($user); | ||||
|         $repository->purgeAll(); | ||||
|         //        $set  = PiggyBank::leftJoin('accounts', 'accounts.id', 'piggy_banks.account_id')
 | ||||
|         //            ->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*'])
 | ||||
|         //        ;
 | ||||
|         //
 | ||||
|         //        /** @var PiggyBank $piggy */
 | ||||
|         //        foreach ($set as $piggy) {
 | ||||
|         //            $piggy->forceDelete();
 | ||||
|         //        }
 | ||||
| 
 | ||||
|         // rule group
 | ||||
|         RuleGroup::whereUserId($user->id)->onlyTrashed()->forceDelete(); | ||||
|   | ||||
| @@ -79,11 +79,11 @@ class AccountController extends Controller | ||||
|         /** @var array $expense */ | ||||
|         foreach ($expenses as $expense) { | ||||
|             $result[] = [ | ||||
|                 'id'               => (string)$expense['id'], | ||||
|                 'id'               => (string) $expense['id'], | ||||
|                 'name'             => $expense['name'], | ||||
|                 'difference'       => $expense['sum'], | ||||
|                 'difference_float' => (float)$expense['sum'], // intentional float
 | ||||
|                 'currency_id'      => (string)$expense['currency_id'], | ||||
|                 'difference_float' => (float) $expense['sum'], // intentional float
 | ||||
|                 'currency_id'      => (string) $expense['currency_id'], | ||||
|                 'currency_code'    => $expense['currency_code'], | ||||
|             ]; | ||||
|         } | ||||
| @@ -107,11 +107,11 @@ class AccountController extends Controller | ||||
|         /** @var array $expense */ | ||||
|         foreach ($expenses as $expense) { | ||||
|             $result[] = [ | ||||
|                 'id'               => (string)$expense['id'], | ||||
|                 'id'               => (string) $expense['id'], | ||||
|                 'name'             => $expense['name'], | ||||
|                 'difference'       => $expense['sum'], | ||||
|                 'difference_float' => (float)$expense['sum'], // intentional float
 | ||||
|                 'currency_id'      => (string)$expense['currency_id'], | ||||
|                 'difference_float' => (float) $expense['sum'], // intentional float
 | ||||
|                 'currency_id'      => (string) $expense['currency_id'], | ||||
|                 'currency_code'    => $expense['currency_code'], | ||||
|             ]; | ||||
|         } | ||||
|   | ||||
| @@ -26,8 +26,8 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Expense; | ||||
| 
 | ||||
| use FireflyIII\Api\V1\Controllers\Controller; | ||||
| use FireflyIII\Api\V1\Requests\Insight\GenericRequest; | ||||
| use FireflyIII\Enums\TransactionTypeEnum; | ||||
| use FireflyIII\Helpers\Collector\GroupCollectorInterface; | ||||
| use FireflyIII\Models\TransactionType; | ||||
| use FireflyIII\Repositories\Bill\BillRepositoryInterface; | ||||
| use Illuminate\Http\JsonResponse; | ||||
| 
 | ||||
| @@ -76,38 +76,38 @@ class BillController extends Controller | ||||
| 
 | ||||
|         // collect all expenses in this period (regardless of type) by the given bills and accounts.
 | ||||
|         $collector  = app(GroupCollectorInterface::class); | ||||
|         $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts); | ||||
|         $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts); | ||||
|         $collector->setBills($bills); | ||||
| 
 | ||||
|         $genericSet = $collector->getExtractedJournals(); | ||||
|         foreach ($genericSet as $journal) { | ||||
|             $billId            = (int)$journal['bill_id']; | ||||
|             $currencyId        = (int)$journal['currency_id']; | ||||
|             $foreignCurrencyId = (int)$journal['foreign_currency_id']; | ||||
|             $billId            = (int) $journal['bill_id']; | ||||
|             $currencyId        = (int) $journal['currency_id']; | ||||
|             $foreignCurrencyId = (int) $journal['foreign_currency_id']; | ||||
|             $key               = sprintf('%d-%d', $billId, $currencyId); | ||||
|             $foreignKey        = sprintf('%d-%d', $billId, $foreignCurrencyId); | ||||
| 
 | ||||
|             if (0 !== $currencyId) { | ||||
|                 $response[$key] ??= [ | ||||
|                     'id'               => (string)$billId, | ||||
|                     'id'               => (string) $billId, | ||||
|                     'name'             => $journal['bill_name'], | ||||
|                     'difference'       => '0', | ||||
|                     'difference_float' => 0, | ||||
|                     'currency_id'      => (string)$currencyId, | ||||
|                     'currency_id'      => (string) $currencyId, | ||||
|                     'currency_code'    => $journal['currency_code'], | ||||
|                 ]; | ||||
|                 $response[$key]['difference']       = bcadd($response[$key]['difference'], $journal['amount']); | ||||
|                 $response[$key]['difference_float'] = (float)$response[$key]['difference']; // intentional float
 | ||||
|                 $response[$key]['difference_float'] = (float) $response[$key]['difference']; // intentional float
 | ||||
|             } | ||||
|             if (0 !== $foreignCurrencyId) { | ||||
|                 $response[$foreignKey] ??= [ | ||||
|                     'difference'       => '0', | ||||
|                     'difference_float' => 0, | ||||
|                     'currency_id'      => (string)$foreignCurrencyId, | ||||
|                     'currency_id'      => (string) $foreignCurrencyId, | ||||
|                     'currency_code'    => $journal['foreign_currency_code'], | ||||
|                 ]; | ||||
|                 $response[$foreignKey]['difference']       = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']); | ||||
|                 $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // intentional float
 | ||||
|                 $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float
 | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
| @@ -129,34 +129,34 @@ class BillController extends Controller | ||||
| 
 | ||||
|         // collect all expenses in this period (regardless of type) by the given bills and accounts.
 | ||||
|         $collector  = app(GroupCollectorInterface::class); | ||||
|         $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts); | ||||
|         $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts); | ||||
|         $collector->withoutBill(); | ||||
| 
 | ||||
|         $genericSet = $collector->getExtractedJournals(); | ||||
| 
 | ||||
|         foreach ($genericSet as $journal) { | ||||
|             $currencyId        = (int)$journal['currency_id']; | ||||
|             $foreignCurrencyId = (int)$journal['foreign_currency_id']; | ||||
|             $currencyId        = (int) $journal['currency_id']; | ||||
|             $foreignCurrencyId = (int) $journal['foreign_currency_id']; | ||||
| 
 | ||||
|             if (0 !== $currencyId) { | ||||
|                 $response[$currencyId] ??= [ | ||||
|                     'difference'       => '0', | ||||
|                     'difference_float' => 0, | ||||
|                     'currency_id'      => (string)$currencyId, | ||||
|                     'currency_id'      => (string) $currencyId, | ||||
|                     'currency_code'    => $journal['currency_code'], | ||||
|                 ]; | ||||
|                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']); | ||||
|                 $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // intentional float
 | ||||
|                 $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // intentional float
 | ||||
|             } | ||||
|             if (0 !== $foreignCurrencyId) { | ||||
|                 $response[$foreignCurrencyId] ??= [ | ||||
|                     'difference'       => '0', | ||||
|                     'difference_float' => 0, | ||||
|                     'currency_id'      => (string)$foreignCurrencyId, | ||||
|                     'currency_id'      => (string) $foreignCurrencyId, | ||||
|                     'currency_code'    => $journal['foreign_currency_code'], | ||||
|                 ]; | ||||
|                 $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']); | ||||
|                 $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // intentional float
 | ||||
|                 $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // intentional float
 | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * BudgetController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
| @@ -84,11 +85,11 @@ class BudgetController extends Controller | ||||
|             /** @var array $expense */ | ||||
|             foreach ($expenses as $expense) { | ||||
|                 $result[] = [ | ||||
|                     'id'               => (string)$budget->id, | ||||
|                     'id'               => (string) $budget->id, | ||||
|                     'name'             => $budget->name, | ||||
|                     'difference'       => $expense['sum'], | ||||
|                     'difference_float' => (float)$expense['sum'], // intentional float
 | ||||
|                     'currency_id'      => (string)$expense['currency_id'], | ||||
|                     'difference_float' => (float) $expense['sum'], // intentional float
 | ||||
|                     'currency_id'      => (string) $expense['currency_id'], | ||||
|                     'currency_code'    => $expense['currency_code'], | ||||
|                 ]; | ||||
|             } | ||||
| @@ -113,8 +114,8 @@ class BudgetController extends Controller | ||||
|         foreach ($expenses as $expense) { | ||||
|             $result[] = [ | ||||
|                 'difference'       => $expense['sum'], | ||||
|                 'difference_float' => (float)$expense['sum'], // intentional float
 | ||||
|                 'currency_id'      => (string)$expense['currency_id'], | ||||
|                 'difference_float' => (float) $expense['sum'], // intentional float
 | ||||
|                 'currency_id'      => (string) $expense['currency_id'], | ||||
|                 'currency_code'    => $expense['currency_code'], | ||||
|             ]; | ||||
|         } | ||||
|   | ||||
| @@ -85,11 +85,11 @@ class CategoryController extends Controller | ||||
|             /** @var array $expense */ | ||||
|             foreach ($expenses as $expense) { | ||||
|                 $result[] = [ | ||||
|                     'id'               => (string)$category->id, | ||||
|                     'id'               => (string) $category->id, | ||||
|                     'name'             => $category->name, | ||||
|                     'difference'       => $expense['sum'], | ||||
|                     'difference_float' => (float)$expense['sum'], // intentional float
 | ||||
|                     'currency_id'      => (string)$expense['currency_id'], | ||||
|                     'difference_float' => (float) $expense['sum'], // intentional float
 | ||||
|                     'currency_id'      => (string) $expense['currency_id'], | ||||
|                     'currency_code'    => $expense['currency_code'], | ||||
|                 ]; | ||||
|             } | ||||
| @@ -114,8 +114,8 @@ class CategoryController extends Controller | ||||
|         foreach ($expenses as $expense) { | ||||
|             $result[] = [ | ||||
|                 'difference'       => $expense['sum'], | ||||
|                 'difference_float' => (float)$expense['sum'], // intentional float
 | ||||
|                 'currency_id'      => (string)$expense['currency_id'], | ||||
|                 'difference_float' => (float) $expense['sum'], // intentional float
 | ||||
|                 'currency_id'      => (string) $expense['currency_id'], | ||||
|                 'currency_code'    => $expense['currency_code'], | ||||
|             ]; | ||||
|         } | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * PeriodController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
| @@ -25,8 +26,8 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Expense; | ||||
| 
 | ||||
| use FireflyIII\Api\V1\Controllers\Controller; | ||||
| use FireflyIII\Api\V1\Requests\Insight\GenericRequest; | ||||
| use FireflyIII\Enums\TransactionTypeEnum; | ||||
| use FireflyIII\Helpers\Collector\GroupCollectorInterface; | ||||
| use FireflyIII\Models\TransactionType; | ||||
| use Illuminate\Http\JsonResponse; | ||||
| 
 | ||||
| /** | ||||
| @@ -47,31 +48,31 @@ class PeriodController extends Controller | ||||
| 
 | ||||
|         // collect all expenses in this period (regardless of type)
 | ||||
|         $collector  = app(GroupCollectorInterface::class); | ||||
|         $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts); | ||||
|         $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts); | ||||
|         $genericSet = $collector->getExtractedJournals(); | ||||
|         foreach ($genericSet as $journal) { | ||||
|             $currencyId        = (int)$journal['currency_id']; | ||||
|             $foreignCurrencyId = (int)$journal['foreign_currency_id']; | ||||
|             $currencyId        = (int) $journal['currency_id']; | ||||
|             $foreignCurrencyId = (int) $journal['foreign_currency_id']; | ||||
| 
 | ||||
|             if (0 !== $currencyId) { | ||||
|                 $response[$currencyId] ??= [ | ||||
|                     'difference'       => '0', | ||||
|                     'difference_float' => 0, | ||||
|                     'currency_id'      => (string)$currencyId, | ||||
|                     'currency_id'      => (string) $currencyId, | ||||
|                     'currency_code'    => $journal['currency_code'], | ||||
|                 ]; | ||||
|                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']); | ||||
|                 $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // intentional float
 | ||||
|                 $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // intentional float
 | ||||
|             } | ||||
|             if (0 !== $foreignCurrencyId) { | ||||
|                 $response[$foreignCurrencyId] ??= [ | ||||
|                     'difference'       => '0', | ||||
|                     'difference_float' => 0, | ||||
|                     'currency_id'      => (string)$foreignCurrencyId, | ||||
|                     'currency_id'      => (string) $foreignCurrencyId, | ||||
|                     'currency_code'    => $journal['foreign_currency_code'], | ||||
|                 ]; | ||||
|                 $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']); | ||||
|                 $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // intentional float
 | ||||
|                 $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // intentional float
 | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
|   | ||||
| @@ -26,8 +26,8 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Expense; | ||||
| 
 | ||||
| use FireflyIII\Api\V1\Controllers\Controller; | ||||
| use FireflyIII\Api\V1\Requests\Insight\GenericRequest; | ||||
| use FireflyIII\Enums\TransactionTypeEnum; | ||||
| use FireflyIII\Helpers\Collector\GroupCollectorInterface; | ||||
| use FireflyIII\Models\TransactionType; | ||||
| use FireflyIII\Repositories\Tag\TagRepositoryInterface; | ||||
| use Illuminate\Http\JsonResponse; | ||||
| 
 | ||||
| @@ -69,34 +69,34 @@ class TagController extends Controller | ||||
| 
 | ||||
|         // collect all expenses in this period (regardless of type) by the given bills and accounts.
 | ||||
|         $collector  = app(GroupCollectorInterface::class); | ||||
|         $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts); | ||||
|         $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts); | ||||
|         $collector->withoutTags(); | ||||
| 
 | ||||
|         $genericSet = $collector->getExtractedJournals(); | ||||
| 
 | ||||
|         foreach ($genericSet as $journal) { | ||||
|             $currencyId        = (int)$journal['currency_id']; | ||||
|             $foreignCurrencyId = (int)$journal['foreign_currency_id']; | ||||
|             $currencyId        = (int) $journal['currency_id']; | ||||
|             $foreignCurrencyId = (int) $journal['foreign_currency_id']; | ||||
| 
 | ||||
|             if (0 !== $currencyId) { | ||||
|                 $response[$currencyId] ??= [ | ||||
|                     'difference'       => '0', | ||||
|                     'difference_float' => 0, | ||||
|                     'currency_id'      => (string)$currencyId, | ||||
|                     'currency_id'      => (string) $currencyId, | ||||
|                     'currency_code'    => $journal['currency_code'], | ||||
|                 ]; | ||||
|                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']); | ||||
|                 $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // float but on purpose.
 | ||||
|                 $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // float but on purpose.
 | ||||
|             } | ||||
|             if (0 !== $foreignCurrencyId) { | ||||
|                 $response[$foreignCurrencyId] ??= [ | ||||
|                     'difference'       => '0', | ||||
|                     'difference_float' => 0, | ||||
|                     'currency_id'      => (string)$foreignCurrencyId, | ||||
|                     'currency_id'      => (string) $foreignCurrencyId, | ||||
|                     'currency_code'    => $journal['foreign_currency_code'], | ||||
|                 ]; | ||||
|                 $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']); | ||||
|                 $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // float but on purpose.
 | ||||
|                 $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // float but on purpose.
 | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
| @@ -124,14 +124,14 @@ class TagController extends Controller | ||||
| 
 | ||||
|         // collect all expenses in this period (regardless of type) by the given bills and accounts.
 | ||||
|         $collector  = app(GroupCollectorInterface::class); | ||||
|         $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts); | ||||
|         $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts); | ||||
|         $collector->setTags($tags); | ||||
|         $genericSet = $collector->getExtractedJournals(); | ||||
| 
 | ||||
|         /** @var array $journal */ | ||||
|         foreach ($genericSet as $journal) { | ||||
|             $currencyId        = (int)$journal['currency_id']; | ||||
|             $foreignCurrencyId = (int)$journal['foreign_currency_id']; | ||||
|             $currencyId        = (int) $journal['currency_id']; | ||||
|             $foreignCurrencyId = (int) $journal['foreign_currency_id']; | ||||
| 
 | ||||
|             /** @var array $tag */ | ||||
|             foreach ($journal['tags'] as $tag) { | ||||
| @@ -142,15 +142,15 @@ class TagController extends Controller | ||||
|                 // on currency ID
 | ||||
|                 if (0 !== $currencyId) { | ||||
|                     $response[$key] ??= [ | ||||
|                         'id'               => (string)$tagId, | ||||
|                         'id'               => (string) $tagId, | ||||
|                         'name'             => $tag['name'], | ||||
|                         'difference'       => '0', | ||||
|                         'difference_float' => 0, | ||||
|                         'currency_id'      => (string)$currencyId, | ||||
|                         'currency_id'      => (string) $currencyId, | ||||
|                         'currency_code'    => $journal['currency_code'], | ||||
|                     ]; | ||||
|                     $response[$key]['difference']       = bcadd($response[$key]['difference'], $journal['amount']); | ||||
|                     $response[$key]['difference_float'] = (float)$response[$key]['difference']; // float but on purpose.
 | ||||
|                     $response[$key]['difference_float'] = (float) $response[$key]['difference']; // float but on purpose.
 | ||||
|                 } | ||||
| 
 | ||||
|                 // on foreign ID
 | ||||
| @@ -158,11 +158,11 @@ class TagController extends Controller | ||||
|                     $response[$foreignKey]                     = $journal[$foreignKey] ?? [ | ||||
|                         'difference'       => '0', | ||||
|                         'difference_float' => 0, | ||||
|                         'currency_id'      => (string)$foreignCurrencyId, | ||||
|                         'currency_id'      => (string) $foreignCurrencyId, | ||||
|                         'currency_code'    => $journal['foreign_currency_code'], | ||||
|                     ]; | ||||
|                     $response[$foreignKey]['difference']       = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']); | ||||
|                     $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // float but on purpose.
 | ||||
|                     $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // float but on purpose.
 | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|   | ||||
| @@ -79,11 +79,11 @@ class AccountController extends Controller | ||||
|         /** @var array $entry */ | ||||
|         foreach ($income as $entry) { | ||||
|             $result[] = [ | ||||
|                 'id'               => (string)$entry['id'], | ||||
|                 'id'               => (string) $entry['id'], | ||||
|                 'name'             => $entry['name'], | ||||
|                 'difference'       => $entry['sum'], | ||||
|                 'difference_float' => (float)$entry['sum'], // float but on purpose.
 | ||||
|                 'currency_id'      => (string)$entry['currency_id'], | ||||
|                 'difference_float' => (float) $entry['sum'], // float but on purpose.
 | ||||
|                 'currency_id'      => (string) $entry['currency_id'], | ||||
|                 'currency_code'    => $entry['currency_code'], | ||||
|             ]; | ||||
|         } | ||||
| @@ -107,11 +107,11 @@ class AccountController extends Controller | ||||
|         /** @var array $entry */ | ||||
|         foreach ($income as $entry) { | ||||
|             $result[] = [ | ||||
|                 'id'               => (string)$entry['id'], | ||||
|                 'id'               => (string) $entry['id'], | ||||
|                 'name'             => $entry['name'], | ||||
|                 'difference'       => $entry['sum'], | ||||
|                 'difference_float' => (float)$entry['sum'], // float but on purpose.
 | ||||
|                 'currency_id'      => (string)$entry['currency_id'], | ||||
|                 'difference_float' => (float) $entry['sum'], // float but on purpose.
 | ||||
|                 'currency_id'      => (string) $entry['currency_id'], | ||||
|                 'currency_code'    => $entry['currency_code'], | ||||
|             ]; | ||||
|         } | ||||
|   | ||||
| @@ -85,11 +85,11 @@ class CategoryController extends Controller | ||||
|             /** @var array $expense */ | ||||
|             foreach ($expenses as $expense) { | ||||
|                 $result[] = [ | ||||
|                     'id'               => (string)$category->id, | ||||
|                     'id'               => (string) $category->id, | ||||
|                     'name'             => $category->name, | ||||
|                     'difference'       => $expense['sum'], | ||||
|                     'difference_float' => (float)$expense['sum'], // float but on purpose.
 | ||||
|                     'currency_id'      => (string)$expense['currency_id'], | ||||
|                     'difference_float' => (float) $expense['sum'], // float but on purpose.
 | ||||
|                     'currency_id'      => (string) $expense['currency_id'], | ||||
|                     'currency_code'    => $expense['currency_code'], | ||||
|                 ]; | ||||
|             } | ||||
| @@ -114,8 +114,8 @@ class CategoryController extends Controller | ||||
|         foreach ($expenses as $expense) { | ||||
|             $result[] = [ | ||||
|                 'difference'       => $expense['sum'], | ||||
|                 'difference_float' => (float)$expense['sum'], // float but on purpose.
 | ||||
|                 'currency_id'      => (string)$expense['currency_id'], | ||||
|                 'difference_float' => (float) $expense['sum'], // float but on purpose.
 | ||||
|                 'currency_id'      => (string) $expense['currency_id'], | ||||
|                 'currency_code'    => $expense['currency_code'], | ||||
|             ]; | ||||
|         } | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * PeriodController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
| @@ -25,8 +26,8 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Income; | ||||
| 
 | ||||
| use FireflyIII\Api\V1\Controllers\Controller; | ||||
| use FireflyIII\Api\V1\Requests\Insight\GenericRequest; | ||||
| use FireflyIII\Enums\TransactionTypeEnum; | ||||
| use FireflyIII\Helpers\Collector\GroupCollectorInterface; | ||||
| use FireflyIII\Models\TransactionType; | ||||
| use Illuminate\Http\JsonResponse; | ||||
| 
 | ||||
| /** | ||||
| @@ -47,34 +48,34 @@ class PeriodController extends Controller | ||||
| 
 | ||||
|         // collect all expenses in this period (regardless of type)
 | ||||
|         $collector  = app(GroupCollectorInterface::class); | ||||
|         $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts); | ||||
|         $collector->setTypes([TransactionTypeEnum::DEPOSIT->value])->setRange($start, $end)->setDestinationAccounts($accounts); | ||||
|         $genericSet = $collector->getExtractedJournals(); | ||||
|         foreach ($genericSet as $journal) { | ||||
|             $currencyId        = (int)$journal['currency_id']; | ||||
|             $foreignCurrencyId = (int)$journal['foreign_currency_id']; | ||||
|             $currencyId        = (int) $journal['currency_id']; | ||||
|             $foreignCurrencyId = (int) $journal['foreign_currency_id']; | ||||
| 
 | ||||
|             if (0 !== $currencyId) { | ||||
|                 $response[$currencyId] ??= [ | ||||
|                     'difference'       => '0', | ||||
|                     'difference_float' => 0, | ||||
|                     'currency_id'      => (string)$currencyId, | ||||
|                     'currency_id'      => (string) $currencyId, | ||||
|                     'currency_code'    => $journal['currency_code'], | ||||
|                 ]; | ||||
|                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount'])); | ||||
|                 $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // float but on purpose.
 | ||||
|                 $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // float but on purpose.
 | ||||
|             } | ||||
|             if (0 !== $foreignCurrencyId) { | ||||
|                 $response[$foreignCurrencyId] ??= [ | ||||
|                     'difference'       => '0', | ||||
|                     'difference_float' => 0, | ||||
|                     'currency_id'      => (string)$foreignCurrencyId, | ||||
|                     'currency_id'      => (string) $foreignCurrencyId, | ||||
|                     'currency_code'    => $journal['foreign_currency_code'], | ||||
|                 ]; | ||||
|                 $response[$foreignCurrencyId]['difference']       = bcadd( | ||||
|                     $response[$foreignCurrencyId]['difference'], | ||||
|                     app('steam')->positive($journal['foreign_amount']) | ||||
|                 ); | ||||
|                 $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // float but on purpose.
 | ||||
|                 $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // float but on purpose.
 | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
|   | ||||
| @@ -26,8 +26,8 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Income; | ||||
| 
 | ||||
| use FireflyIII\Api\V1\Controllers\Controller; | ||||
| use FireflyIII\Api\V1\Requests\Insight\GenericRequest; | ||||
| use FireflyIII\Enums\TransactionTypeEnum; | ||||
| use FireflyIII\Helpers\Collector\GroupCollectorInterface; | ||||
| use FireflyIII\Models\TransactionType; | ||||
| use FireflyIII\Repositories\Tag\TagRepositoryInterface; | ||||
| use Illuminate\Http\JsonResponse; | ||||
| 
 | ||||
| @@ -70,37 +70,37 @@ class TagController extends Controller | ||||
| 
 | ||||
|         // collect all expenses in this period (regardless of type) by the given bills and accounts.
 | ||||
|         $collector  = app(GroupCollectorInterface::class); | ||||
|         $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts); | ||||
|         $collector->setTypes([TransactionTypeEnum::DEPOSIT->value])->setRange($start, $end)->setDestinationAccounts($accounts); | ||||
|         $collector->withoutTags(); | ||||
| 
 | ||||
|         $genericSet = $collector->getExtractedJournals(); | ||||
| 
 | ||||
|         foreach ($genericSet as $journal) { | ||||
|             $currencyId        = (int)$journal['currency_id']; | ||||
|             $foreignCurrencyId = (int)$journal['foreign_currency_id']; | ||||
|             $currencyId        = (int) $journal['currency_id']; | ||||
|             $foreignCurrencyId = (int) $journal['foreign_currency_id']; | ||||
| 
 | ||||
|             if (0 !== $currencyId) { | ||||
|                 $response[$currencyId] ??= [ | ||||
|                     'difference'       => '0', | ||||
|                     'difference_float' => 0, | ||||
|                     'currency_id'      => (string)$currencyId, | ||||
|                     'currency_id'      => (string) $currencyId, | ||||
|                     'currency_code'    => $journal['currency_code'], | ||||
|                 ]; | ||||
|                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount'])); | ||||
|                 $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; | ||||
|                 $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; | ||||
|             } | ||||
|             if (0 !== $foreignCurrencyId) { | ||||
|                 $response[$foreignCurrencyId] ??= [ | ||||
|                     'difference'       => '0', | ||||
|                     'difference_float' => 0, | ||||
|                     'currency_id'      => (string)$foreignCurrencyId, | ||||
|                     'currency_id'      => (string) $foreignCurrencyId, | ||||
|                     'currency_code'    => $journal['foreign_currency_code'], | ||||
|                 ]; | ||||
|                 $response[$foreignCurrencyId]['difference']       = bcadd( | ||||
|                     $response[$foreignCurrencyId]['difference'], | ||||
|                     app('steam')->positive($journal['foreign_amount']) | ||||
|                 ); | ||||
|                 $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; | ||||
|                 $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
| @@ -128,14 +128,14 @@ class TagController extends Controller | ||||
| 
 | ||||
|         // collect all expenses in this period (regardless of type) by the given bills and accounts.
 | ||||
|         $collector  = app(GroupCollectorInterface::class); | ||||
|         $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts); | ||||
|         $collector->setTypes([TransactionTypeEnum::DEPOSIT->value])->setRange($start, $end)->setDestinationAccounts($accounts); | ||||
|         $collector->setTags($tags); | ||||
|         $genericSet = $collector->getExtractedJournals(); | ||||
| 
 | ||||
|         /** @var array $journal */ | ||||
|         foreach ($genericSet as $journal) { | ||||
|             $currencyId        = (int)$journal['currency_id']; | ||||
|             $foreignCurrencyId = (int)$journal['foreign_currency_id']; | ||||
|             $currencyId        = (int) $journal['currency_id']; | ||||
|             $foreignCurrencyId = (int) $journal['foreign_currency_id']; | ||||
| 
 | ||||
|             /** @var array $tag */ | ||||
|             foreach ($journal['tags'] as $tag) { | ||||
| @@ -146,15 +146,15 @@ class TagController extends Controller | ||||
|                 // on currency ID
 | ||||
|                 if (0 !== $currencyId) { | ||||
|                     $response[$key] ??= [ | ||||
|                         'id'               => (string)$tagId, | ||||
|                         'id'               => (string) $tagId, | ||||
|                         'name'             => $tag['name'], | ||||
|                         'difference'       => '0', | ||||
|                         'difference_float' => 0, | ||||
|                         'currency_id'      => (string)$currencyId, | ||||
|                         'currency_id'      => (string) $currencyId, | ||||
|                         'currency_code'    => $journal['currency_code'], | ||||
|                     ]; | ||||
|                     $response[$key]['difference']       = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount'])); | ||||
|                     $response[$key]['difference_float'] = (float)$response[$key]['difference']; | ||||
|                     $response[$key]['difference_float'] = (float) $response[$key]['difference']; | ||||
|                 } | ||||
| 
 | ||||
|                 // on foreign ID
 | ||||
| @@ -162,14 +162,14 @@ class TagController extends Controller | ||||
|                     $response[$foreignKey]                     = $journal[$foreignKey] ?? [ | ||||
|                         'difference'       => '0', | ||||
|                         'difference_float' => 0, | ||||
|                         'currency_id'      => (string)$foreignCurrencyId, | ||||
|                         'currency_id'      => (string) $foreignCurrencyId, | ||||
|                         'currency_code'    => $journal['foreign_currency_code'], | ||||
|                     ]; | ||||
|                     $response[$foreignKey]['difference']       = bcadd( | ||||
|                         $response[$foreignKey]['difference'], | ||||
|                         app('steam')->positive($journal['foreign_amount']) | ||||
|                     ); | ||||
|                     $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; | ||||
|                     $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * AccountController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * CategoryController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
| @@ -84,11 +85,11 @@ class CategoryController extends Controller | ||||
|             /** @var array $expense */ | ||||
|             foreach ($expenses as $expense) { | ||||
|                 $result[] = [ | ||||
|                     'id'               => (string)$category->id, | ||||
|                     'id'               => (string) $category->id, | ||||
|                     'name'             => $category->name, | ||||
|                     'difference'       => $expense['sum'], | ||||
|                     'difference_float' => (float)$expense['sum'], | ||||
|                     'currency_id'      => (string)$expense['currency_id'], | ||||
|                     'difference_float' => (float) $expense['sum'], | ||||
|                     'currency_id'      => (string) $expense['currency_id'], | ||||
|                     'currency_code'    => $expense['currency_code'], | ||||
|                 ]; | ||||
|             } | ||||
| @@ -113,8 +114,8 @@ class CategoryController extends Controller | ||||
|         foreach ($expenses as $expense) { | ||||
|             $result[] = [ | ||||
|                 'difference'       => $expense['sum'], | ||||
|                 'difference_float' => (float)$expense['sum'], | ||||
|                 'currency_id'      => (string)$expense['currency_id'], | ||||
|                 'difference_float' => (float) $expense['sum'], | ||||
|                 'currency_id'      => (string) $expense['currency_id'], | ||||
|                 'currency_code'    => $expense['currency_code'], | ||||
|             ]; | ||||
|         } | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * PeriodController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
| @@ -50,31 +51,31 @@ class PeriodController extends Controller | ||||
|         $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts); | ||||
|         $genericSet = $collector->getExtractedJournals(); | ||||
|         foreach ($genericSet as $journal) { | ||||
|             $currencyId        = (int)$journal['currency_id']; | ||||
|             $foreignCurrencyId = (int)$journal['foreign_currency_id']; | ||||
|             $currencyId        = (int) $journal['currency_id']; | ||||
|             $foreignCurrencyId = (int) $journal['foreign_currency_id']; | ||||
| 
 | ||||
|             if (0 !== $currencyId) { | ||||
|                 $response[$currencyId] ??= [ | ||||
|                     'difference'       => '0', | ||||
|                     'difference_float' => 0, | ||||
|                     'currency_id'      => (string)$currencyId, | ||||
|                     'currency_id'      => (string) $currencyId, | ||||
|                     'currency_code'    => $journal['currency_code'], | ||||
|                 ]; | ||||
|                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount'])); | ||||
|                 $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; | ||||
|                 $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; | ||||
|             } | ||||
|             if (0 !== $foreignCurrencyId) { | ||||
|                 $response[$foreignCurrencyId] ??= [ | ||||
|                     'difference'       => '0', | ||||
|                     'difference_float' => 0, | ||||
|                     'currency_id'      => (string)$foreignCurrencyId, | ||||
|                     'currency_id'      => (string) $foreignCurrencyId, | ||||
|                     'currency_code'    => $journal['foreign_currency_code'], | ||||
|                 ]; | ||||
|                 $response[$foreignCurrencyId]['difference']       = bcadd( | ||||
|                     $response[$foreignCurrencyId]['difference'], | ||||
|                     app('steam')->positive($journal['foreign_amount']) | ||||
|                 ); | ||||
|                 $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; | ||||
|                 $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * TagController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
| @@ -73,31 +74,31 @@ class TagController extends Controller | ||||
|         $genericSet = $collector->getExtractedJournals(); | ||||
| 
 | ||||
|         foreach ($genericSet as $journal) { | ||||
|             $currencyId        = (int)$journal['currency_id']; | ||||
|             $foreignCurrencyId = (int)$journal['foreign_currency_id']; | ||||
|             $currencyId        = (int) $journal['currency_id']; | ||||
|             $foreignCurrencyId = (int) $journal['foreign_currency_id']; | ||||
| 
 | ||||
|             if (0 !== $currencyId) { | ||||
|                 $response[$currencyId] ??= [ | ||||
|                     'difference'       => '0', | ||||
|                     'difference_float' => 0, | ||||
|                     'currency_id'      => (string)$currencyId, | ||||
|                     'currency_id'      => (string) $currencyId, | ||||
|                     'currency_code'    => $journal['currency_code'], | ||||
|                 ]; | ||||
|                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount'])); | ||||
|                 $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; | ||||
|                 $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; | ||||
|             } | ||||
|             if (0 !== $foreignCurrencyId) { | ||||
|                 $response[$foreignCurrencyId] ??= [ | ||||
|                     'difference'       => '0', | ||||
|                     'difference_float' => 0, | ||||
|                     'currency_id'      => (string)$foreignCurrencyId, | ||||
|                     'currency_id'      => (string) $foreignCurrencyId, | ||||
|                     'currency_code'    => $journal['foreign_currency_code'], | ||||
|                 ]; | ||||
|                 $response[$foreignCurrencyId]['difference']       = bcadd( | ||||
|                     $response[$foreignCurrencyId]['difference'], | ||||
|                     app('steam')->positive($journal['foreign_amount']) | ||||
|                 ); | ||||
|                 $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; | ||||
|                 $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
| @@ -131,8 +132,8 @@ class TagController extends Controller | ||||
| 
 | ||||
|         /** @var array $journal */ | ||||
|         foreach ($genericSet as $journal) { | ||||
|             $currencyId        = (int)$journal['currency_id']; | ||||
|             $foreignCurrencyId = (int)$journal['foreign_currency_id']; | ||||
|             $currencyId        = (int) $journal['currency_id']; | ||||
|             $foreignCurrencyId = (int) $journal['foreign_currency_id']; | ||||
| 
 | ||||
|             /** @var array $tag */ | ||||
|             foreach ($journal['tags'] as $tag) { | ||||
| @@ -143,15 +144,15 @@ class TagController extends Controller | ||||
|                 // on currency ID
 | ||||
|                 if (0 !== $currencyId) { | ||||
|                     $response[$key] ??= [ | ||||
|                         'id'               => (string)$tagId, | ||||
|                         'id'               => (string) $tagId, | ||||
|                         'name'             => $tag['name'], | ||||
|                         'difference'       => '0', | ||||
|                         'difference_float' => 0, | ||||
|                         'currency_id'      => (string)$currencyId, | ||||
|                         'currency_id'      => (string) $currencyId, | ||||
|                         'currency_code'    => $journal['currency_code'], | ||||
|                     ]; | ||||
|                     $response[$key]['difference']       = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount'])); | ||||
|                     $response[$key]['difference_float'] = (float)$response[$key]['difference']; | ||||
|                     $response[$key]['difference_float'] = (float) $response[$key]['difference']; | ||||
|                 } | ||||
| 
 | ||||
|                 // on foreign ID
 | ||||
| @@ -159,14 +160,14 @@ class TagController extends Controller | ||||
|                     $response[$foreignKey]                     = $journal[$foreignKey] ?? [ | ||||
|                         'difference'       => '0', | ||||
|                         'difference_float' => 0, | ||||
|                         'currency_id'      => (string)$foreignCurrencyId, | ||||
|                         'currency_id'      => (string) $foreignCurrencyId, | ||||
|                         'currency_code'    => $journal['foreign_currency_code'], | ||||
|                     ]; | ||||
|                     $response[$foreignKey]['difference']       = bcadd( | ||||
|                         $response[$foreignKey]['difference'], | ||||
|                         app('steam')->positive($journal['foreign_amount']) | ||||
|                     ); | ||||
|                     $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // intentional float
 | ||||
|                     $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float
 | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /** | ||||
|  * AccountController.php | ||||
|  * Copyright (c) 2019 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /** | ||||
|  * AccountController.php | ||||
|  * Copyright (c) 2019 james@firefly-iii.org | ||||
| @@ -110,7 +111,7 @@ class ListController extends Controller | ||||
|         // types to get, page size:
 | ||||
|         $pageSize    = $this->parameters->get('limit'); | ||||
| 
 | ||||
|         // get list of budgets. Count it and split it.
 | ||||
|         // get list of piggy banks. Count it and split it.
 | ||||
|         $collection  = $this->repository->getPiggyBanks($account); | ||||
|         $count       = $collection->count(); | ||||
|         $piggyBanks  = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ShowController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /** | ||||
|  * AccountController.php | ||||
|  * Copyright (c) 2019 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /** | ||||
|  * AccountController.php | ||||
|  * Copyright (c) 2019 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * DestroyController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ShowController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
| @@ -104,7 +105,7 @@ class ShowController extends Controller | ||||
|                 ->header('Expires', '0') | ||||
|                 ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0') | ||||
|                 ->header('Pragma', 'public') | ||||
|                 ->header('Content-Length', (string)strlen($content)) | ||||
|                 ->header('Content-Length', (string) strlen($content)) | ||||
|             ; | ||||
| 
 | ||||
|             return $response; | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * StoreController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
| @@ -112,7 +113,12 @@ class StoreController extends Controller | ||||
| 
 | ||||
|             return response()->json([], 422); | ||||
|         } | ||||
|         $helper->saveAttachmentFromApi($attachment, $body); | ||||
|         $result = $helper->saveAttachmentFromApi($attachment, $body); | ||||
|         if (false === $result) { | ||||
|             app('log')->error('Could not save attachment from API.'); | ||||
| 
 | ||||
|             return response()->json([], 422); | ||||
|         } | ||||
| 
 | ||||
|         return response()->json([], 204); | ||||
|     } | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * UpdateController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ShowController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * DestroyController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ListController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ShowController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * StoreController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * UpdateController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * DestroyController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ListController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ShowController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * StoreController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * UpdateController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * DestroyController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ListController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ShowController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * StoreController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
| @@ -68,6 +69,7 @@ class StoreController extends Controller | ||||
|         $data               = $request->getAll(); | ||||
|         $data['start_date'] = $data['start']; | ||||
|         $data['end_date']   = $data['end']; | ||||
|         $data['notes']      = $data['notes']; | ||||
|         $data['budget_id']  = $budget->id; | ||||
| 
 | ||||
|         $budgetLimit        = $this->blRepository->store($data); | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * UpdateController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * DestroyController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ListController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ShowController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * StoreController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * UpdateController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * DestroyController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ListController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ShowController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * UpdateController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * DestroyController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ListController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
| @@ -27,6 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller; | ||||
| use FireflyIII\Exceptions\FireflyException; | ||||
| use FireflyIII\Models\PiggyBank; | ||||
| use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; | ||||
| use FireflyIII\Transformers\AccountTransformer; | ||||
| use FireflyIII\Transformers\AttachmentTransformer; | ||||
| use FireflyIII\Transformers\PiggyBankEventTransformer; | ||||
| use Illuminate\Http\JsonResponse; | ||||
| @@ -57,6 +59,38 @@ class ListController extends Controller | ||||
|         ); | ||||
|     } | ||||
| 
 | ||||
|     /** | ||||
|      * This endpoint is documented at: | ||||
|      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/listAccountByPiggyBank
 | ||||
|      * | ||||
|      * List single resource. | ||||
|      * | ||||
|      * @throws FireflyException | ||||
|      */ | ||||
|     public function accounts(PiggyBank $piggyBank): JsonResponse | ||||
|     { | ||||
|         // types to get, page size:
 | ||||
|         $pageSize    = $this->parameters->get('limit'); | ||||
|         $manager     = $this->getManager(); | ||||
| 
 | ||||
|         $collection  = $piggyBank->accounts; | ||||
|         $count       = $collection->count(); | ||||
|         $events      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); | ||||
| 
 | ||||
|         // make paginator:
 | ||||
|         $paginator   = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page')); | ||||
|         $paginator->setPath(route('api.v1.piggy-banks.accounts', [$piggyBank->id]).$this->buildParams()); | ||||
| 
 | ||||
|         /** @var AccountTransformer $transformer */ | ||||
|         $transformer = app(AccountTransformer::class); | ||||
|         $transformer->setParameters($this->parameters); | ||||
| 
 | ||||
|         $resource    = new FractalCollection($events, $transformer, 'accounts'); | ||||
|         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); | ||||
| 
 | ||||
|         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); | ||||
|     } | ||||
| 
 | ||||
|     /** | ||||
|      * This endpoint is documented at: | ||||
|      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/listAttachmentByPiggyBank
 | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ShowController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
| @@ -71,7 +72,7 @@ class ShowController extends Controller | ||||
|         // types to get, page size:
 | ||||
|         $pageSize    = $this->parameters->get('limit'); | ||||
| 
 | ||||
|         // get list of budgets. Count it and split it.
 | ||||
|         // get list of piggy banks. Count it and split it.
 | ||||
|         $collection  = $this->repository->getPiggyBanks(); | ||||
|         $count       = $collection->count(); | ||||
|         $piggyBanks  = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * StoreController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * UpdateController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * DestroyController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ListController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ShowController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * StoreController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * UpdateController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * DestroyController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ExpressionController.php | ||||
|  * Copyright (c) 2024 Michael Thomas | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ShowController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * StoreController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * TriggerController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * UpdateController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * DestroyController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ListController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * ShowController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * StoreController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * TriggerController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| <?php | ||||
| 
 | ||||
| /* | ||||
|  * UpdateController.php | ||||
|  * Copyright (c) 2021 james@firefly-iii.org | ||||
|   | ||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user