diff --git a/composer.lock b/composer.lock index 78757c9..a8d28da 100644 --- a/composer.lock +++ b/composer.lock @@ -786,6 +786,7 @@ "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.3" }, "time": "2024-07-08T12:26:09+00:00" +<<<<<<< HEAD }, { "name": "doctrine/dbal", @@ -941,6 +942,8 @@ "source": "https://github.com/doctrine/deprecations/tree/1.1.3" }, "time": "2024-01-30T19:34:25+00:00" +======= +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) }, { "name": "doctrine/inflector", @@ -2348,6 +2351,7 @@ }, { "name": "laravel/framework", +<<<<<<< HEAD "version": "v11.30.0", "source": { "type": "git", @@ -2358,6 +2362,18 @@ "type": "zip", "url": "https://api.github.com/repos/laravel/framework/zipball/dff716442d9c229d716be82ccc9a7de52eb97193", "reference": "dff716442d9c229d716be82ccc9a7de52eb97193", +======= + "version": "v11.31.0", + "source": { + "type": "git", + "url": "https://github.com/laravel/framework.git", + "reference": "365090ed2c68244e3141cdb5e247cdf3dfba2c40" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/framework/zipball/365090ed2c68244e3141cdb5e247cdf3dfba2c40", + "reference": "365090ed2c68244e3141cdb5e247cdf3dfba2c40", +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) "shasum": "" }, "require": { @@ -2553,6 +2569,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, +<<<<<<< HEAD "time": "2024-10-30T15:00:34+00:00" }, { @@ -2567,6 +2584,22 @@ "type": "zip", "url": "https://api.github.com/repos/laravel/prompts/zipball/0f3848a445562dac376b27968f753c65e7e1036e", "reference": "0f3848a445562dac376b27968f753c65e7e1036e", +======= + "time": "2024-11-12T15:36:15+00:00" + }, + { + "name": "laravel/prompts", + "version": "v0.3.2", + "source": { + "type": "git", + "url": "https://github.com/laravel/prompts.git", + "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/prompts/zipball/0e0535747c6b8d6d10adca8b68293cf4517abb0f", + "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f", +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) "shasum": "" }, "require": { @@ -2582,7 +2615,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" }, @@ -2610,6 +2643,7 @@ "description": "Add beautiful and user-friendly forms to your command-line applications.", "support": { "issues": "https://github.com/laravel/prompts/issues", +<<<<<<< HEAD "source": "https://github.com/laravel/prompts/tree/v0.3.1" }, "time": "2024-10-09T19:42:26+00:00" @@ -2690,6 +2724,24 @@ "type": "zip", "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c", "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c", +======= + "source": "https://github.com/laravel/prompts/tree/v0.3.2" + }, + "time": "2024-11-12T14:59:47+00:00" + }, + { + "name": "laravel/serializable-closure", + "version": "v1.3.6", + "source": { + "type": "git", + "url": "https://github.com/laravel/serializable-closure.git", + "reference": "f865a58ea3a0107c336b7045104c75243fa59d96" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f865a58ea3a0107c336b7045104c75243fa59d96", + "reference": "f865a58ea3a0107c336b7045104c75243fa59d96", +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) "shasum": "" }, "require": { @@ -2737,7 +2789,11 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, +<<<<<<< HEAD "time": "2024-09-23T13:33:08+00:00" +======= + "time": "2024-11-11T17:06:04+00:00" +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) }, { "name": "laravel/tinker", @@ -2994,6 +3050,7 @@ "time": "2022-12-11T20:36:23+00:00" }, { +<<<<<<< HEAD "name": "league/csv", "version": "9.18.0", "source": { @@ -3090,6 +3147,17 @@ }, "dist": { "type": "zip", +======= + "name": "league/flysystem", + "version": "3.29.1", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/flysystem.git", + "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319" + }, + "dist": { + "type": "zip", +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/edc1bb7c86fab0776c3287dbd19b5fa278347319", "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319", "shasum": "" @@ -3269,6 +3337,7 @@ "time": "2024-09-21T08:32:55+00:00" }, { +<<<<<<< HEAD "name": "league/uri", "version": "7.4.1", "source": { @@ -3661,6 +3730,19 @@ "type": "zip", "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f4393b648b78a5408747de94fca38beb5f7e9ef8", "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8", +======= + "name": "monolog/monolog", + "version": "3.8.0", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog.git", + "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/32e515fdc02cdafbe4593e30a9350d486b125b67", + "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67", +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) "shasum": "" }, "require": { @@ -3680,12 +3762,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" }, @@ -3736,7 +3820,11 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", +<<<<<<< HEAD "source": "https://github.com/Seldaek/monolog/tree/3.7.0" +======= + "source": "https://github.com/Seldaek/monolog/tree/3.8.0" +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) }, "funding": [ { @@ -3748,7 +3836,11 @@ "type": "tidelift" } ], +<<<<<<< HEAD "time": "2024-06-28T09:40:51+00:00" +======= + "time": "2024-11-12T13:57:08+00:00" +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) }, { "name": "mtdowling/jmespath.php", @@ -3818,6 +3910,7 @@ }, { "name": "nesbot/carbon", +<<<<<<< HEAD "version": "3.8.0", "source": { "type": "git", @@ -3828,10 +3921,22 @@ "type": "zip", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bbd3eef89af8ba66a3aa7952b5439168fbcc529f", "reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f", +======= + "version": "3.8.2", + "source": { + "type": "git", + "url": "https://github.com/briannesbitt/Carbon.git", + "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e1268cdbc486d97ce23fef2c666dc3c6b6de9947", + "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947", +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) "shasum": "" }, "require": { - "carbonphp/carbon-doctrine-types": "*", + "carbonphp/carbon-doctrine-types": "<100.0", "ext-json": "*", "php": "^8.1", "psr/clock": "^1.0", @@ -3920,7 +4025,11 @@ "type": "tidelift" } ], +<<<<<<< HEAD "time": "2024-08-19T06:22:39+00:00" +======= + "time": "2024-11-07T17:46:48+00:00" +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) }, { "name": "nette/schema", @@ -5428,6 +5537,7 @@ "time": "2024-04-27T21:32:50+00:00" }, { +<<<<<<< HEAD "name": "ryangjchandler/blade-capture-directive", "version": "v1.0.0", "source": { @@ -5764,6 +5874,17 @@ }, "dist": { "type": "zip", +======= + "name": "symfony/clock", + "version": "v7.1.6", + "source": { + "type": "git", + "url": "https://github.com/symfony/clock.git", + "reference": "97bebc53548684c17ed696bc8af016880f0f098d" + }, + "dist": { + "type": "zip", +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) "url": "https://api.github.com/repos/symfony/clock/zipball/97bebc53548684c17ed696bc8af016880f0f098d", "reference": "97bebc53548684c17ed696bc8af016880f0f098d", "shasum": "" @@ -5830,6 +5951,7 @@ }, { "name": "symfony/console", +<<<<<<< HEAD "version": "v7.1.6", "source": { "type": "git", @@ -5840,6 +5962,18 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/console/zipball/bb5192af6edc797cbab5c8e8ecfea2fe5f421e57", "reference": "bb5192af6edc797cbab5c8e8ecfea2fe5f421e57", +======= + "version": "v7.1.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/console.git", + "reference": "ff04e5b5ba043d2badfb308197b9e6b42883fcd5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/console/zipball/ff04e5b5ba043d2badfb308197b9e6b42883fcd5", + "reference": "ff04e5b5ba043d2badfb308197b9e6b42883fcd5", +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) "shasum": "" }, "require": { @@ -5903,7 +6037,11 @@ "terminal" ], "support": { +<<<<<<< HEAD "source": "https://github.com/symfony/console/tree/v7.1.6" +======= + "source": "https://github.com/symfony/console/tree/v7.1.8" +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) }, "funding": [ { @@ -5919,7 +6057,11 @@ "type": "tidelift" } ], +<<<<<<< HEAD "time": "2024-10-09T08:46:59+00:00" +======= + "time": "2024-11-06T14:23:19+00:00" +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) }, { "name": "symfony/css-selector", @@ -6055,6 +6197,7 @@ }, { "name": "symfony/error-handler", +<<<<<<< HEAD "version": "v7.1.6", "source": { "type": "git", @@ -6065,6 +6208,18 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/error-handler/zipball/d60117093c2a9fe667baa8fedf84e8a09b9c592f", "reference": "d60117093c2a9fe667baa8fedf84e8a09b9c592f", +======= + "version": "v7.1.7", + "source": { + "type": "git", + "url": "https://github.com/symfony/error-handler.git", + "reference": "010e44661f4c6babaf8c4862fe68c24a53903342" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/010e44661f4c6babaf8c4862fe68c24a53903342", + "reference": "010e44661f4c6babaf8c4862fe68c24a53903342", +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) "shasum": "" }, "require": { @@ -6110,7 +6265,11 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { +<<<<<<< HEAD "source": "https://github.com/symfony/error-handler/tree/v7.1.6" +======= + "source": "https://github.com/symfony/error-handler/tree/v7.1.7" +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) }, "funding": [ { @@ -6126,7 +6285,11 @@ "type": "tidelift" } ], +<<<<<<< HEAD "time": "2024-09-25T14:20:29+00:00" +======= + "time": "2024-11-05T15:34:55+00:00" +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) }, { "name": "symfony/event-dispatcher", @@ -6349,6 +6512,7 @@ "time": "2024-10-01T08:31:23+00:00" }, { +<<<<<<< HEAD "name": "symfony/html-sanitizer", "version": "v7.1.6", "source": { @@ -6429,6 +6593,19 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3d7bbf071b25f802f7d55524d408bed414ea71e2", "reference": "3d7bbf071b25f802f7d55524d408bed414ea71e2", +======= + "name": "symfony/http-foundation", + "version": "v7.1.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-foundation.git", + "reference": "f4419ec69ccfc3f725a4de7c20e4e57626d10112" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f4419ec69ccfc3f725a4de7c20e4e57626d10112", + "reference": "f4419ec69ccfc3f725a4de7c20e4e57626d10112", +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) "shasum": "" }, "require": { @@ -6438,12 +6615,12 @@ }, "conflict": { "doctrine/dbal": "<3.6", - "symfony/cache": "<6.4" + "symfony/cache": "<6.4.12|>=7.0,<7.1.5" }, "require-dev": { "doctrine/dbal": "^3.6|^4", "predis/predis": "^1.1|^2.0", - "symfony/cache": "^6.4|^7.0", + "symfony/cache": "^6.4.12|^7.1.5", "symfony/dependency-injection": "^6.4|^7.0", "symfony/expression-language": "^6.4|^7.0", "symfony/http-kernel": "^6.4|^7.0", @@ -6476,7 +6653,11 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { +<<<<<<< HEAD "source": "https://github.com/symfony/http-foundation/tree/v7.1.6" +======= + "source": "https://github.com/symfony/http-foundation/tree/v7.1.8" +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) }, "funding": [ { @@ -6492,6 +6673,7 @@ "type": "tidelift" } ], +<<<<<<< HEAD "time": "2024-10-11T19:23:14+00:00" }, { @@ -6506,6 +6688,22 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5d8315899cd76b2e7e29179bf5fea103e41bdf03", "reference": "5d8315899cd76b2e7e29179bf5fea103e41bdf03", +======= + "time": "2024-11-09T09:16:45+00:00" + }, + { + "name": "symfony/http-kernel", + "version": "v7.1.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-kernel.git", + "reference": "33fef24e3dc79d6d30bf4936531f2f4bd2ca189e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/33fef24e3dc79d6d30bf4936531f2f4bd2ca189e", + "reference": "33fef24e3dc79d6d30bf4936531f2f4bd2ca189e", +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) "shasum": "" }, "require": { @@ -6590,7 +6788,11 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { +<<<<<<< HEAD "source": "https://github.com/symfony/http-kernel/tree/v7.1.6" +======= + "source": "https://github.com/symfony/http-kernel/tree/v7.1.8" +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) }, "funding": [ { @@ -6606,7 +6808,11 @@ "type": "tidelift" } ], +<<<<<<< HEAD "time": "2024-10-27T13:54:21+00:00" +======= + "time": "2024-11-13T14:25:32+00:00" +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) }, { "name": "symfony/mailer", @@ -7410,6 +7616,7 @@ }, { "name": "symfony/process", +<<<<<<< HEAD "version": "v7.1.6", "source": { "type": "git", @@ -7420,6 +7627,18 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/process/zipball/6aaa189ddb4ff6b5de8fa3210f2fb42c87b4d12e", "reference": "6aaa189ddb4ff6b5de8fa3210f2fb42c87b4d12e", +======= + "version": "v7.1.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "42783370fda6e538771f7c7a36e9fa2ee3a84892" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/42783370fda6e538771f7c7a36e9fa2ee3a84892", + "reference": "42783370fda6e538771f7c7a36e9fa2ee3a84892", +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) "shasum": "" }, "require": { @@ -7451,7 +7670,11 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { +<<<<<<< HEAD "source": "https://github.com/symfony/process/tree/v7.1.6" +======= + "source": "https://github.com/symfony/process/tree/v7.1.8" +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) }, "funding": [ { @@ -7467,7 +7690,11 @@ "type": "tidelift" } ], +<<<<<<< HEAD "time": "2024-09-25T14:20:29+00:00" +======= + "time": "2024-11-06T14:23:19+00:00" +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) }, { "name": "symfony/routing", @@ -7635,6 +7862,7 @@ }, { "name": "symfony/string", +<<<<<<< HEAD "version": "v7.1.6", "source": { "type": "git", @@ -7645,6 +7873,18 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/string/zipball/61b72d66bf96c360a727ae6232df5ac83c71f626", "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626", +======= + "version": "v7.1.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/string.git", + "reference": "591ebd41565f356fcd8b090fe64dbb5878f50281" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/string/zipball/591ebd41565f356fcd8b090fe64dbb5878f50281", + "reference": "591ebd41565f356fcd8b090fe64dbb5878f50281", +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) "shasum": "" }, "require": { @@ -7702,7 +7942,11 @@ "utf8" ], "support": { +<<<<<<< HEAD "source": "https://github.com/symfony/string/tree/v7.1.6" +======= + "source": "https://github.com/symfony/string/tree/v7.1.8" +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) }, "funding": [ { @@ -7718,7 +7962,11 @@ "type": "tidelift" } ], +<<<<<<< HEAD "time": "2024-09-25T14:20:29+00:00" +======= + "time": "2024-11-13T13:31:21+00:00" +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) }, { "name": "symfony/translation", @@ -7968,6 +8216,7 @@ }, { "name": "symfony/var-dumper", +<<<<<<< HEAD "version": "v7.1.6", "source": { "type": "git", @@ -7978,6 +8227,18 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/cb5bd55a6b8c2c1c7fb68b0aeae0e257948a720c", "reference": "cb5bd55a6b8c2c1c7fb68b0aeae0e257948a720c", +======= + "version": "v7.1.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-dumper.git", + "reference": "7bb01a47b1b00428d32b5e7b4d3b2d1aa58d3db8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7bb01a47b1b00428d32b5e7b4d3b2d1aa58d3db8", + "reference": "7bb01a47b1b00428d32b5e7b4d3b2d1aa58d3db8", +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) "shasum": "" }, "require": { @@ -8031,7 +8292,11 @@ "dump" ], "support": { +<<<<<<< HEAD "source": "https://github.com/symfony/var-dumper/tree/v7.1.6" +======= + "source": "https://github.com/symfony/var-dumper/tree/v7.1.8" +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) }, "funding": [ { @@ -8047,7 +8312,11 @@ "type": "tidelift" } ], +<<<<<<< HEAD "time": "2024-09-25T14:20:29+00:00" +======= + "time": "2024-11-08T15:46:42+00:00" +>>>>>>> fb651ab (Bump laravel/framework from 11.11.1 to 11.31.0 (#363)) }, { "name": "tijsverkoyen/css-to-inline-styles",