mirror of
				https://github.com/firefly-iii/firefly-iii.git
				synced 2025-10-31 02:36:28 +00:00 
			
		
		
		
	Merge branch 'main' into develop
This commit is contained in:
		
							
								
								
									
										62
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										62
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							| @@ -2547,16 +2547,16 @@ | ||||
|         }, | ||||
|         { | ||||
|             "name": "laravel/framework", | ||||
|             "version": "v11.30.0", | ||||
|             "version": "v11.31.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/laravel/framework.git", | ||||
|                 "reference": "dff716442d9c229d716be82ccc9a7de52eb97193" | ||||
|                 "reference": "365090ed2c68244e3141cdb5e247cdf3dfba2c40" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/laravel/framework/zipball/dff716442d9c229d716be82ccc9a7de52eb97193", | ||||
|                 "reference": "dff716442d9c229d716be82ccc9a7de52eb97193", | ||||
|                 "url": "https://api.github.com/repos/laravel/framework/zipball/365090ed2c68244e3141cdb5e247cdf3dfba2c40", | ||||
|                 "reference": "365090ed2c68244e3141cdb5e247cdf3dfba2c40", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @@ -2752,7 +2752,7 @@ | ||||
|                 "issues": "https://github.com/laravel/framework/issues", | ||||
|                 "source": "https://github.com/laravel/framework" | ||||
|             }, | ||||
|             "time": "2024-10-30T15:00:34+00:00" | ||||
|             "time": "2024-11-12T15:36:15+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "laravel/passport", | ||||
| @@ -2832,16 +2832,16 @@ | ||||
|         }, | ||||
|         { | ||||
|             "name": "laravel/prompts", | ||||
|             "version": "v0.3.1", | ||||
|             "version": "v0.3.2", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/laravel/prompts.git", | ||||
|                 "reference": "0f3848a445562dac376b27968f753c65e7e1036e" | ||||
|                 "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/laravel/prompts/zipball/0f3848a445562dac376b27968f753c65e7e1036e", | ||||
|                 "reference": "0f3848a445562dac376b27968f753c65e7e1036e", | ||||
|                 "url": "https://api.github.com/repos/laravel/prompts/zipball/0e0535747c6b8d6d10adca8b68293cf4517abb0f", | ||||
|                 "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @@ -2857,7 +2857,7 @@ | ||||
|             "require-dev": { | ||||
|                 "illuminate/collections": "^10.0|^11.0", | ||||
|                 "mockery/mockery": "^1.5", | ||||
|                 "pestphp/pest": "^2.3", | ||||
|                 "pestphp/pest": "^2.3|^3.4", | ||||
|                 "phpstan/phpstan": "^1.11", | ||||
|                 "phpstan/phpstan-mockery": "^1.1" | ||||
|             }, | ||||
| @@ -2885,9 +2885,9 @@ | ||||
|             "description": "Add beautiful and user-friendly forms to your command-line applications.", | ||||
|             "support": { | ||||
|                 "issues": "https://github.com/laravel/prompts/issues", | ||||
|                 "source": "https://github.com/laravel/prompts/tree/v0.3.1" | ||||
|                 "source": "https://github.com/laravel/prompts/tree/v0.3.2" | ||||
|             }, | ||||
|             "time": "2024-10-09T19:42:26+00:00" | ||||
|             "time": "2024-11-12T14:59:47+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "laravel/sanctum", | ||||
| @@ -2955,16 +2955,16 @@ | ||||
|         }, | ||||
|         { | ||||
|             "name": "laravel/serializable-closure", | ||||
|             "version": "v1.3.5", | ||||
|             "version": "v1.3.6", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/laravel/serializable-closure.git", | ||||
|                 "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c" | ||||
|                 "reference": "f865a58ea3a0107c336b7045104c75243fa59d96" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c", | ||||
|                 "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c", | ||||
|                 "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f865a58ea3a0107c336b7045104c75243fa59d96", | ||||
|                 "reference": "f865a58ea3a0107c336b7045104c75243fa59d96", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @@ -3012,7 +3012,7 @@ | ||||
|                 "issues": "https://github.com/laravel/serializable-closure/issues", | ||||
|                 "source": "https://github.com/laravel/serializable-closure" | ||||
|             }, | ||||
|             "time": "2024-09-23T13:33:08+00:00" | ||||
|             "time": "2024-11-11T17:06:04+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "laravel/slack-notification-channel", | ||||
| @@ -4266,16 +4266,16 @@ | ||||
|         }, | ||||
|         { | ||||
|             "name": "monolog/monolog", | ||||
|             "version": "3.7.0", | ||||
|             "version": "3.8.0", | ||||
|             "source": { | ||||
|                 "type": "git", | ||||
|                 "url": "https://github.com/Seldaek/monolog.git", | ||||
|                 "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8" | ||||
|                 "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67" | ||||
|             }, | ||||
|             "dist": { | ||||
|                 "type": "zip", | ||||
|                 "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f4393b648b78a5408747de94fca38beb5f7e9ef8", | ||||
|                 "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8", | ||||
|                 "url": "https://api.github.com/repos/Seldaek/monolog/zipball/32e515fdc02cdafbe4593e30a9350d486b125b67", | ||||
|                 "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67", | ||||
|                 "shasum": "" | ||||
|             }, | ||||
|             "require": { | ||||
| @@ -4295,12 +4295,14 @@ | ||||
|                 "guzzlehttp/psr7": "^2.2", | ||||
|                 "mongodb/mongodb": "^1.8", | ||||
|                 "php-amqplib/php-amqplib": "~2.4 || ^3", | ||||
|                 "phpstan/phpstan": "^1.9", | ||||
|                 "phpstan/phpstan-deprecation-rules": "^1.0", | ||||
|                 "phpstan/phpstan-strict-rules": "^1.4", | ||||
|                 "phpunit/phpunit": "^10.5.17", | ||||
|                 "php-console/php-console": "^3.1.8", | ||||
|                 "phpstan/phpstan": "^2", | ||||
|                 "phpstan/phpstan-deprecation-rules": "^2", | ||||
|                 "phpstan/phpstan-strict-rules": "^2", | ||||
|                 "phpunit/phpunit": "^10.5.17 || ^11.0.7", | ||||
|                 "predis/predis": "^1.1 || ^2", | ||||
|                 "ruflin/elastica": "^7", | ||||
|                 "rollbar/rollbar": "^4.0", | ||||
|                 "ruflin/elastica": "^7 || ^8", | ||||
|                 "symfony/mailer": "^5.4 || ^6", | ||||
|                 "symfony/mime": "^5.4 || ^6" | ||||
|             }, | ||||
| @@ -4351,7 +4353,7 @@ | ||||
|             ], | ||||
|             "support": { | ||||
|                 "issues": "https://github.com/Seldaek/monolog/issues", | ||||
|                 "source": "https://github.com/Seldaek/monolog/tree/3.7.0" | ||||
|                 "source": "https://github.com/Seldaek/monolog/tree/3.8.0" | ||||
|             }, | ||||
|             "funding": [ | ||||
|                 { | ||||
| @@ -4363,7 +4365,7 @@ | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2024-06-28T09:40:51+00:00" | ||||
|             "time": "2024-11-12T13:57:08+00:00" | ||||
|         }, | ||||
|         { | ||||
|             "name": "nesbot/carbon", | ||||
| @@ -13560,7 +13562,7 @@ | ||||
|     ], | ||||
|     "aliases": [], | ||||
|     "minimum-stability": "stable", | ||||
|     "stability-flags": {}, | ||||
|     "stability-flags": [], | ||||
|     "prefer-stable": false, | ||||
|     "prefer-lowest": false, | ||||
|     "platform": { | ||||
| @@ -13581,6 +13583,6 @@ | ||||
|         "ext-xml": "*", | ||||
|         "ext-xmlwriter": "*" | ||||
|     }, | ||||
|     "platform-dev": {}, | ||||
|     "platform-dev": [], | ||||
|     "plugin-api-version": "2.6.0" | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user