solving conflict

main
Ilham Wara Nugroho 2026-05-08 11:02:20 +07:00
parent 9ee8957774
commit 6a3517ddf0
6 changed files with 0 additions and 507 deletions

View File

@ -1548,8 +1548,6 @@ return array(
'Doctrine\\Common\\EventSubscriberRegistry' => $vendorDir . '/doctrine/event-manager/src/EventSubscriberRegistry.php',
'Doctrine\\Common\\Lexer\\AbstractLexer' => $vendorDir . '/doctrine/lexer/src/AbstractLexer.php',
'Doctrine\\Common\\Lexer\\Token' => $vendorDir . '/doctrine/lexer/src/Token.php',
<<<<<<< HEAD
=======
'Doctrine\\DBAL\\ArrayParameterType' => $vendorDir . '/doctrine/dbal/src/ArrayParameterType.php',
'Doctrine\\DBAL\\ArrayParameters\\Exception' => $vendorDir . '/doctrine/dbal/src/ArrayParameters/Exception.php',
'Doctrine\\DBAL\\ArrayParameters\\Exception\\MissingNamedParameter' => $vendorDir . '/doctrine/dbal/src/ArrayParameters/Exception/MissingNamedParameter.php',
@ -1897,7 +1895,6 @@ return array(
'Doctrine\\DBAL\\VersionAwarePlatformDriver' => $vendorDir . '/doctrine/dbal/src/VersionAwarePlatformDriver.php',
'Doctrine\\Deprecations\\Deprecation' => $vendorDir . '/doctrine/deprecations/src/Deprecation.php',
'Doctrine\\Deprecations\\PHPUnit\\VerifyDeprecations' => $vendorDir . '/doctrine/deprecations/src/PHPUnit/VerifyDeprecations.php',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'Doctrine\\Inflector\\CachedWordInflector' => $vendorDir . '/doctrine/inflector/src/CachedWordInflector.php',
'Doctrine\\Inflector\\GenericLanguageInflectorFactory' => $vendorDir . '/doctrine/inflector/src/GenericLanguageInflectorFactory.php',
'Doctrine\\Inflector\\Inflector' => $vendorDir . '/doctrine/inflector/src/Inflector.php',

View File

@ -28,25 +28,15 @@ return array(
'3bd81c9b8fcc150b69d8b63b4d2ccf23' => $vendorDir . '/spatie/flare-client-php/src/helpers.php',
'8a9dc1de0ca7e01f3e08231539562f61' => $vendorDir . '/aws/aws-sdk-php/src/functions.php',
'29ffe97919493792170d47eb03a68da9' => $vendorDir . '/blade-ui-kit/blade-icons/src/helpers.php',
<<<<<<< HEAD
'47e1160838b5e5a10346ac4084b58c23' => $vendorDir . '/laravel/prompts/src/helpers.php',
'6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
'801c31d8ed748cfa537fa45402288c95' => $vendorDir . '/psy/psysh/src/functions.php',
'e39a8b23c42d4e1452234d762b03835a' => $vendorDir . '/ramsey/uuid/src/functions.php',
=======
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'476ca15b8d69b04665cd879be9cb4c68' => $vendorDir . '/laravel/framework/src/Illuminate/Collections/functions.php',
'265b4faa2b3a9766332744949e83bf97' => $vendorDir . '/laravel/framework/src/Illuminate/Collections/helpers.php',
'c7a3c339e7e14b60e06a2d7fcce9476b' => $vendorDir . '/laravel/framework/src/Illuminate/Events/functions.php',
'f57d353b41eb2e234b26064d63d8c5dd' => $vendorDir . '/laravel/framework/src/Illuminate/Filesystem/functions.php',
'f0906e6318348a765ffb6eb24e0d0938' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/helpers.php',
'58571171fd5812e6e447dce228f52f4d' => $vendorDir . '/laravel/framework/src/Illuminate/Support/helpers.php',
<<<<<<< HEAD
=======
'6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
'801c31d8ed748cfa537fa45402288c95' => $vendorDir . '/psy/psysh/src/functions.php',
'062a54fe8f6f91078b197f2922521dd9' => $vendorDir . '/laravel/pint/overrides/Runner/Parallel/ProcessFactory.php',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'c72349b1fe8d0deeedd3a52e8aa814d8' => $vendorDir . '/mockery/mockery/library/helpers.php',
'ce9671a430e4846b44e1c68c7611f9f5' => $vendorDir . '/mockery/mockery/library/Mockery.php',
'a1cfe24d14977df6878b9bf804af2d1c' => $vendorDir . '/nunomaduro/collision/src/Adapters/Phpunit/Autoload.php',

View File

@ -62,11 +62,7 @@ return array(
'PhpOption\\' => array($vendorDir . '/phpoption/phpoption/src/PhpOption'),
'PhpOffice\\PhpSpreadsheet\\' => array($vendorDir . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet'),
'NunoMaduro\\Collision\\' => array($vendorDir . '/nunomaduro/collision/src'),
<<<<<<< HEAD
'Nette\\' => array($vendorDir . '/nette/schema/src', $vendorDir . '/nette/utils/src'),
=======
'Nette\\' => array($vendorDir . '/nette/utils/src', $vendorDir . '/nette/schema/src'),
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
'Mockery\\' => array($vendorDir . '/mockery/mockery/library/Mockery'),
'Matrix\\' => array($vendorDir . '/markbaker/matrix/classes/src'),
@ -98,11 +94,8 @@ return array(
'Egulias\\EmailValidator\\' => array($vendorDir . '/egulias/email-validator/src'),
'Dotenv\\' => array($vendorDir . '/vlucas/phpdotenv/src'),
'Doctrine\\Inflector\\' => array($vendorDir . '/doctrine/inflector/src'),
<<<<<<< HEAD
=======
'Doctrine\\Deprecations\\' => array($vendorDir . '/doctrine/deprecations/src'),
'Doctrine\\DBAL\\' => array($vendorDir . '/doctrine/dbal/src'),
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/src'),
'Doctrine\\Common\\' => array($vendorDir . '/doctrine/event-manager/src'),
'Dflydev\\DotAccessData\\' => array($vendorDir . '/dflydev/dot-access-data/src'),

View File

@ -29,25 +29,15 @@ class ComposerStaticInit89656637435d34ce7295d546ba9c533b
'3bd81c9b8fcc150b69d8b63b4d2ccf23' => __DIR__ . '/..' . '/spatie/flare-client-php/src/helpers.php',
'8a9dc1de0ca7e01f3e08231539562f61' => __DIR__ . '/..' . '/aws/aws-sdk-php/src/functions.php',
'29ffe97919493792170d47eb03a68da9' => __DIR__ . '/..' . '/blade-ui-kit/blade-icons/src/helpers.php',
<<<<<<< HEAD
'47e1160838b5e5a10346ac4084b58c23' => __DIR__ . '/..' . '/laravel/prompts/src/helpers.php',
'6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
'801c31d8ed748cfa537fa45402288c95' => __DIR__ . '/..' . '/psy/psysh/src/functions.php',
'e39a8b23c42d4e1452234d762b03835a' => __DIR__ . '/..' . '/ramsey/uuid/src/functions.php',
=======
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'476ca15b8d69b04665cd879be9cb4c68' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Collections/functions.php',
'265b4faa2b3a9766332744949e83bf97' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Collections/helpers.php',
'c7a3c339e7e14b60e06a2d7fcce9476b' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Events/functions.php',
'f57d353b41eb2e234b26064d63d8c5dd' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Filesystem/functions.php',
'f0906e6318348a765ffb6eb24e0d0938' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/helpers.php',
'58571171fd5812e6e447dce228f52f4d' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/helpers.php',
<<<<<<< HEAD
=======
'6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
'801c31d8ed748cfa537fa45402288c95' => __DIR__ . '/..' . '/psy/psysh/src/functions.php',
'062a54fe8f6f91078b197f2922521dd9' => __DIR__ . '/..' . '/laravel/pint/overrides/Runner/Parallel/ProcessFactory.php',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'c72349b1fe8d0deeedd3a52e8aa814d8' => __DIR__ . '/..' . '/mockery/mockery/library/helpers.php',
'ce9671a430e4846b44e1c68c7611f9f5' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery.php',
'a1cfe24d14977df6878b9bf804af2d1c' => __DIR__ . '/..' . '/nunomaduro/collision/src/Adapters/Phpunit/Autoload.php',
@ -61,9 +51,6 @@ class ComposerStaticInit89656637435d34ce7295d546ba9c533b
array (
'voku\\' => 5,
),
<<<<<<< HEAD
'W' =>
=======
'b' =>
array (
'bfinlay\\SpreadsheetSeeder\\' => 26,
@ -73,7 +60,6 @@ class ComposerStaticInit89656637435d34ce7295d546ba9c533b
'ZipStream\\' => 10,
),
'W' =>
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
array (
'Whoops\\' => 7,
),
@ -234,13 +220,6 @@ class ComposerStaticInit89656637435d34ce7295d546ba9c533b
array (
0 => __DIR__ . '/..' . '/voku/portable-ascii/src/voku',
),
<<<<<<< HEAD
'Whoops\\' =>
array (
0 => __DIR__ . '/..' . '/filp/whoops/src/Whoops',
),
'TijsVerkoyen\\CssToInlineStyles\\' =>
=======
'bfinlay\\SpreadsheetSeeder\\' =>
array (
0 => __DIR__ . '/..' . '/bfinlay/laravel-excel-seeder/src',
@ -254,7 +233,6 @@ class ComposerStaticInit89656637435d34ce7295d546ba9c533b
0 => __DIR__ . '/..' . '/filp/whoops/src/Whoops',
),
'TijsVerkoyen\\CssToInlineStyles\\' =>
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
array (
0 => __DIR__ . '/..' . '/tijsverkoyen/css-to-inline-styles/src',
),
@ -445,15 +423,11 @@ class ComposerStaticInit89656637435d34ce7295d546ba9c533b
array (
0 => __DIR__ . '/..' . '/psr/clock/src',
),
<<<<<<< HEAD
'PhpParser\\' =>
=======
'Psr\\Cache\\' =>
array (
0 => __DIR__ . '/..' . '/psr/cache/src',
),
'PhpParser\\' =>
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
array (
0 => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser',
),
@ -461,18 +435,6 @@ class ComposerStaticInit89656637435d34ce7295d546ba9c533b
array (
0 => __DIR__ . '/..' . '/phpoption/phpoption/src/PhpOption',
),
<<<<<<< HEAD
'NunoMaduro\\Collision\\' =>
array (
0 => __DIR__ . '/..' . '/nunomaduro/collision/src',
),
'Nette\\' =>
array (
0 => __DIR__ . '/..' . '/nette/schema/src',
1 => __DIR__ . '/..' . '/nette/utils/src',
),
'Monolog\\' =>
=======
'PhpOffice\\PhpSpreadsheet\\' =>
array (
0 => __DIR__ . '/..' . '/phpoffice/phpspreadsheet/src/PhpSpreadsheet',
@ -487,7 +449,6 @@ class ComposerStaticInit89656637435d34ce7295d546ba9c533b
1 => __DIR__ . '/..' . '/nette/schema/src',
),
'Monolog\\' =>
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
array (
0 => __DIR__ . '/..' . '/monolog/monolog/src/Monolog',
),
@ -495,15 +456,11 @@ class ComposerStaticInit89656637435d34ce7295d546ba9c533b
array (
0 => __DIR__ . '/..' . '/mockery/mockery/library/Mockery',
),
<<<<<<< HEAD
'Masterminds\\' =>
=======
'Matrix\\' =>
array (
0 => __DIR__ . '/..' . '/markbaker/matrix/classes/src',
),
'Masterminds\\' =>
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
array (
0 => __DIR__ . '/..' . '/masterminds/html5/src',
),
@ -616,8 +573,6 @@ class ComposerStaticInit89656637435d34ce7295d546ba9c533b
'Doctrine\\Inflector\\' =>
array (
0 => __DIR__ . '/..' . '/doctrine/inflector/src',
<<<<<<< HEAD
=======
),
'Doctrine\\Deprecations\\' =>
array (
@ -626,21 +581,16 @@ class ComposerStaticInit89656637435d34ce7295d546ba9c533b
'Doctrine\\DBAL\\' =>
array (
0 => __DIR__ . '/..' . '/doctrine/dbal/src',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
),
'Doctrine\\Common\\Lexer\\' =>
array (
0 => __DIR__ . '/..' . '/doctrine/lexer/src',
),
<<<<<<< HEAD
'Dflydev\\DotAccessData\\' =>
=======
'Doctrine\\Common\\' =>
array (
0 => __DIR__ . '/..' . '/doctrine/event-manager/src',
),
'Dflydev\\DotAccessData\\' =>
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
array (
0 => __DIR__ . '/..' . '/dflydev/dot-access-data/src',
),
@ -662,9 +612,6 @@ class ComposerStaticInit89656637435d34ce7295d546ba9c533b
array (
0 => __DIR__ . '/..' . '/dragonmantank/cron-expression/src/Cron',
),
<<<<<<< HEAD
'Carbon\\Doctrine\\' =>
=======
'Composer\\Semver\\' =>
array (
0 => __DIR__ . '/..' . '/composer/semver/src',
@ -678,7 +625,6 @@ class ComposerStaticInit89656637435d34ce7295d546ba9c533b
0 => __DIR__ . '/..' . '/markbaker/complex/classes/src',
),
'Carbon\\Doctrine\\' =>
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
array (
0 => __DIR__ . '/..' . '/carbonphp/carbon-doctrine-types/src/Carbon/Doctrine',
),
@ -2258,8 +2204,6 @@ class ComposerStaticInit89656637435d34ce7295d546ba9c533b
'Doctrine\\Common\\EventSubscriberRegistry' => __DIR__ . '/..' . '/doctrine/event-manager/src/EventSubscriberRegistry.php',
'Doctrine\\Common\\Lexer\\AbstractLexer' => __DIR__ . '/..' . '/doctrine/lexer/src/AbstractLexer.php',
'Doctrine\\Common\\Lexer\\Token' => __DIR__ . '/..' . '/doctrine/lexer/src/Token.php',
<<<<<<< HEAD
=======
'Doctrine\\DBAL\\ArrayParameterType' => __DIR__ . '/..' . '/doctrine/dbal/src/ArrayParameterType.php',
'Doctrine\\DBAL\\ArrayParameters\\Exception' => __DIR__ . '/..' . '/doctrine/dbal/src/ArrayParameters/Exception.php',
'Doctrine\\DBAL\\ArrayParameters\\Exception\\MissingNamedParameter' => __DIR__ . '/..' . '/doctrine/dbal/src/ArrayParameters/Exception/MissingNamedParameter.php',
@ -2607,7 +2551,6 @@ class ComposerStaticInit89656637435d34ce7295d546ba9c533b
'Doctrine\\DBAL\\VersionAwarePlatformDriver' => __DIR__ . '/..' . '/doctrine/dbal/src/VersionAwarePlatformDriver.php',
'Doctrine\\Deprecations\\Deprecation' => __DIR__ . '/..' . '/doctrine/deprecations/src/Deprecation.php',
'Doctrine\\Deprecations\\PHPUnit\\VerifyDeprecations' => __DIR__ . '/..' . '/doctrine/deprecations/src/PHPUnit/VerifyDeprecations.php',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'Doctrine\\Inflector\\CachedWordInflector' => __DIR__ . '/..' . '/doctrine/inflector/src/CachedWordInflector.php',
'Doctrine\\Inflector\\GenericLanguageInflectorFactory' => __DIR__ . '/..' . '/doctrine/inflector/src/GenericLanguageInflectorFactory.php',
'Doctrine\\Inflector\\Inflector' => __DIR__ . '/..' . '/doctrine/inflector/src/Inflector.php',

View File

@ -691,18 +691,6 @@
"install-path": "../dflydev/dot-access-data"
},
{
<<<<<<< HEAD
"name": "doctrine/inflector",
"version": "2.1.0",
"version_normalized": "2.1.0.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
"reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b"
},
"dist": {
"type": "zip",
=======
"name": "doctrine/dbal",
"version": "3.10.5",
"version_normalized": "3.10.5.0",
@ -975,7 +963,6 @@
},
"dist": {
"type": "zip",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"url": "https://api.github.com/repos/doctrine/inflector/zipball/6d6c96277ea252fc1304627204c3d5e6e15faa3b",
"reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b",
"shasum": ""
@ -4521,18 +4508,6 @@
"install-path": "../phar-io/version"
},
{
<<<<<<< HEAD
"name": "phpoption/phpoption",
"version": "1.9.5",
"version_normalized": "1.9.5.0",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/php-option.git",
"reference": "75365b91986c2405cf5e1e012c5595cd487a98be"
},
"dist": {
"type": "zip",
=======
"name": "phpoffice/phpspreadsheet",
"version": "1.30.4",
"version_normalized": "1.30.4.0",
@ -4654,7 +4629,6 @@
},
"dist": {
"type": "zip",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"url": "https://api.github.com/repos/schmittjoh/php-option/zipball/75365b91986c2405cf5e1e012c5595cd487a98be",
"reference": "75365b91986c2405cf5e1e012c5595cd487a98be",
"shasum": ""
@ -7346,19 +7320,6 @@
},
{
"name": "symfony/console",
<<<<<<< HEAD
"version": "v6.4.36",
"version_normalized": "6.4.36.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "9f481cfb580db8bcecc9b2d4c63f3e13df022ad5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/9f481cfb580db8bcecc9b2d4c63f3e13df022ad5",
"reference": "9f481cfb580db8bcecc9b2d4c63f3e13df022ad5",
=======
"version": "v6.4.37",
"version_normalized": "6.4.37.0",
"source": {
@ -7370,7 +7331,6 @@
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/7bbcaf3fdb1e18fa42a7f0b84a10d091c10548f5",
"reference": "7bbcaf3fdb1e18fa42a7f0b84a10d091c10548f5",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"shasum": ""
},
"require": {
@ -7403,11 +7363,7 @@
"symfony/stopwatch": "^5.4|^6.0|^7.0",
"symfony/var-dumper": "^5.4|^6.0|^7.0"
},
<<<<<<< HEAD
"time": "2026-03-27T15:30:51+00:00",
=======
"time": "2026-04-13T15:27:04+00:00",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"type": "library",
"installation-source": "dist",
"autoload": {
@ -7441,11 +7397,7 @@
"terminal"
],
"support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/console/tree/v6.4.36"
=======
"source": "https://github.com/symfony/console/tree/v6.4.37"
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
},
"funding": [
{
@ -7469,19 +7421,6 @@
},
{
"name": "symfony/css-selector",
<<<<<<< HEAD
"version": "v7.4.8",
"version_normalized": "7.4.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "b055f228a4178a1d6774909903905e3475f3eac8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/b055f228a4178a1d6774909903905e3475f3eac8",
"reference": "b055f228a4178a1d6774909903905e3475f3eac8",
=======
"version": "v7.4.9",
"version_normalized": "7.4.9.0",
"source": {
@ -7493,17 +7432,12 @@
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/b75663ed96cf4756e28e3105476f220f92886cc4",
"reference": "b75663ed96cf4756e28e3105476f220f92886cc4",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"shasum": ""
},
"require": {
"php": ">=8.2"
},
<<<<<<< HEAD
"time": "2026-03-24T13:12:05+00:00",
=======
"time": "2026-04-18T13:18:21+00:00",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"type": "library",
"installation-source": "dist",
"autoload": {
@ -7535,11 +7469,7 @@
"description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com",
"support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/css-selector/tree/v7.4.8"
=======
"source": "https://github.com/symfony/css-selector/tree/v7.4.9"
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
},
"funding": [
{
@ -7794,19 +7724,6 @@
},
{
"name": "symfony/event-dispatcher",
<<<<<<< HEAD
"version": "v7.4.8",
"version_normalized": "7.4.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "f57b899fa736fd71121168ef268f23c206083f0a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f57b899fa736fd71121168ef268f23c206083f0a",
"reference": "f57b899fa736fd71121168ef268f23c206083f0a",
=======
"version": "v7.4.9",
"version_normalized": "7.4.9.0",
"source": {
@ -7818,7 +7735,6 @@
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e4a2e29753c7801f7a8340e066cfa788f3bc8101",
"reference": "e4a2e29753c7801f7a8340e066cfa788f3bc8101",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"shasum": ""
},
"require": {
@ -7844,11 +7760,7 @@
"symfony/service-contracts": "^2.5|^3",
"symfony/stopwatch": "^6.4|^7.0|^8.0"
},
<<<<<<< HEAD
"time": "2026-03-30T13:54:39+00:00",
=======
"time": "2026-04-18T13:18:21+00:00",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"type": "library",
"installation-source": "dist",
"autoload": {
@ -7876,11 +7788,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": {
<<<<<<< HEAD
"source": "https://github.com/symfony/event-dispatcher/tree/v7.4.8"
=======
"source": "https://github.com/symfony/event-dispatcher/tree/v7.4.9"
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
},
"funding": [
{
@ -8215,19 +8123,6 @@
},
{
"name": "symfony/http-kernel",
<<<<<<< HEAD
"version": "v6.4.36",
"version_normalized": "6.4.36.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "4087ec02119de450e9ebb60806d69c6bb8c6e468"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/4087ec02119de450e9ebb60806d69c6bb8c6e468",
"reference": "4087ec02119de450e9ebb60806d69c6bb8c6e468",
=======
"version": "v6.4.38",
"version_normalized": "6.4.38.0",
"source": {
@ -8239,7 +8134,6 @@
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/769c1ee766d6c327176f4e3bdaad58f521193abd",
"reference": "769c1ee766d6c327176f4e3bdaad58f521193abd",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"shasum": ""
},
"require": {
@ -8298,11 +8192,7 @@
"symfony/var-exporter": "^6.2|^7.0",
"twig/twig": "^2.13|^3.0.4"
},
<<<<<<< HEAD
"time": "2026-03-31T20:38:11+00:00",
=======
"time": "2026-05-06T13:04:40+00:00",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"type": "library",
"installation-source": "dist",
"autoload": {
@ -8330,11 +8220,7 @@
"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/v6.4.36"
=======
"source": "https://github.com/symfony/http-kernel/tree/v6.4.38"
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
},
"funding": [
{
@ -8445,19 +8331,6 @@
},
{
"name": "symfony/mime",
<<<<<<< HEAD
"version": "v6.4.36",
"version_normalized": "6.4.36.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
"reference": "9c31726137c70798f815fb98293ffb8a2a47694c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/9c31726137c70798f815fb98293ffb8a2a47694c",
"reference": "9c31726137c70798f815fb98293ffb8a2a47694c",
=======
"version": "v6.4.37",
"version_normalized": "6.4.37.0",
"source": {
@ -8469,7 +8342,6 @@
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/330077bc7fbe314758aff62834b758d06ac6d260",
"reference": "330077bc7fbe314758aff62834b758d06ac6d260",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"shasum": ""
},
"require": {
@ -8495,11 +8367,7 @@
"symfony/property-info": "^5.4|^6.0|^7.0",
"symfony/serializer": "^6.4.3|^7.0.3"
},
<<<<<<< HEAD
"time": "2026-03-30T09:31:23+00:00",
=======
"time": "2026-04-29T09:53:28+00:00",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"type": "library",
"installation-source": "dist",
"autoload": {
@ -8531,11 +8399,7 @@
"mime-type"
],
"support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/mime/tree/v6.4.36"
=======
"source": "https://github.com/symfony/mime/tree/v6.4.37"
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
},
"funding": [
{
@ -8559,13 +8423,8 @@
},
{
"name": "symfony/polyfill-ctype",
<<<<<<< HEAD
"version": "v1.33.0",
"version_normalized": "1.33.0.0",
=======
"version": "v1.37.0",
"version_normalized": "1.37.0.0",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
@ -8626,11 +8485,7 @@
"portable"
],
"support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
=======
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.37.0"
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
},
"funding": [
{
@ -8654,19 +8509,6 @@
},
{
"name": "symfony/polyfill-intl-grapheme",
<<<<<<< HEAD
"version": "v1.33.0",
"version_normalized": "1.33.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
"reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
"reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
=======
"version": "v1.37.0",
"version_normalized": "1.37.0.0",
"source": {
@ -8678,7 +8520,6 @@
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/4864388bfbd3001ce88e234fab652acd91fdc57e",
"reference": "4864388bfbd3001ce88e234fab652acd91fdc57e",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"shasum": ""
},
"require": {
@ -8687,11 +8528,7 @@
"suggest": {
"ext-intl": "For best performance"
},
<<<<<<< HEAD
"time": "2025-06-27T09:58:17+00:00",
=======
"time": "2026-04-26T13:13:48+00:00",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"type": "library",
"extra": {
"thanks": {
@ -8733,11 +8570,7 @@
"shim"
],
"support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
=======
"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.37.0"
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
},
"funding": [
{
@ -8761,13 +8594,8 @@
},
{
"name": "symfony/polyfill-intl-idn",
<<<<<<< HEAD
"version": "v1.33.0",
"version_normalized": "1.33.0.0",
=======
"version": "v1.37.0",
"version_normalized": "1.37.0.0",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
@ -8832,11 +8660,7 @@
"shim"
],
"support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.33.0"
=======
"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.37.0"
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
},
"funding": [
{
@ -8860,13 +8684,8 @@
},
{
"name": "symfony/polyfill-intl-normalizer",
<<<<<<< HEAD
"version": "v1.33.0",
"version_normalized": "1.33.0.0",
=======
"version": "v1.37.0",
"version_normalized": "1.37.0.0",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@ -8929,11 +8748,7 @@
"shim"
],
"support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
=======
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.37.0"
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
},
"funding": [
{
@ -8957,13 +8772,8 @@
},
{
"name": "symfony/polyfill-mbstring",
<<<<<<< HEAD
"version": "v1.33.0",
"version_normalized": "1.33.0.0",
=======
"version": "v1.37.0",
"version_normalized": "1.37.0.0",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
@ -9026,11 +8836,7 @@
"shim"
],
"support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
=======
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.37.0"
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
},
"funding": [
{
@ -9054,13 +8860,8 @@
},
{
"name": "symfony/polyfill-php80",
<<<<<<< HEAD
"version": "v1.33.0",
"version_normalized": "1.33.0.0",
=======
"version": "v1.37.0",
"version_normalized": "1.37.0.0",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
@ -9122,11 +8923,7 @@
"shim"
],
"support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
=======
"source": "https://github.com/symfony/polyfill-php80/tree/v1.37.0"
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
},
"funding": [
{
@ -9150,19 +8947,6 @@
},
{
"name": "symfony/polyfill-php83",
<<<<<<< HEAD
"version": "v1.33.0",
"version_normalized": "1.33.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php83.git",
"reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/17f6f9a6b1735c0f163024d959f700cfbc5155e5",
"reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5",
=======
"version": "v1.37.0",
"version_normalized": "1.37.0.0",
"source": {
@ -9174,17 +8958,12 @@
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/3600c2cb22399e25bb226e4a135ce91eeb2a6149",
"reference": "3600c2cb22399e25bb226e4a135ce91eeb2a6149",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"shasum": ""
},
"require": {
"php": ">=7.2"
},
<<<<<<< HEAD
"time": "2025-07-08T02:45:35+00:00",
=======
"time": "2026-04-10T17:25:58+00:00",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"type": "library",
"extra": {
"thanks": {
@ -9227,11 +9006,7 @@
"shim"
],
"support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/polyfill-php83/tree/v1.33.0"
=======
"source": "https://github.com/symfony/polyfill-php83/tree/v1.37.0"
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
},
"funding": [
{
@ -9255,13 +9030,8 @@
},
{
"name": "symfony/polyfill-uuid",
<<<<<<< HEAD
"version": "v1.33.0",
"version_normalized": "1.33.0.0",
=======
"version": "v1.37.0",
"version_normalized": "1.37.0.0",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-uuid.git",
@ -9322,11 +9092,7 @@
"uuid"
],
"support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/polyfill-uuid/tree/v1.33.0"
=======
"source": "https://github.com/symfony/polyfill-uuid/tree/v1.37.0"
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
},
"funding": [
{
@ -9418,19 +9184,6 @@
},
{
"name": "symfony/routing",
<<<<<<< HEAD
"version": "v6.4.34",
"version_normalized": "6.4.34.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "5ab3a3e1a03535ec5ca6ce2d39e4369a1096ae47"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/5ab3a3e1a03535ec5ca6ce2d39e4369a1096ae47",
"reference": "5ab3a3e1a03535ec5ca6ce2d39e4369a1096ae47",
=======
"version": "v6.4.37",
"version_normalized": "6.4.37.0",
"source": {
@ -9442,7 +9195,6 @@
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/48035d186798d27d375d95aad37db8fe097e4048",
"reference": "48035d186798d27d375d95aad37db8fe097e4048",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"shasum": ""
},
"require": {
@ -9464,11 +9216,7 @@
"symfony/http-foundation": "^5.4|^6.0|^7.0",
"symfony/yaml": "^5.4|^6.0|^7.0"
},
<<<<<<< HEAD
"time": "2026-02-24T17:34:50+00:00",
=======
"time": "2026-04-18T13:45:55+00:00",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"type": "library",
"installation-source": "dist",
"autoload": {
@ -9502,11 +9250,7 @@
"url"
],
"support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/routing/tree/v6.4.34"
=======
"source": "https://github.com/symfony/routing/tree/v6.4.37"
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
},
"funding": [
{
@ -9530,19 +9274,6 @@
},
{
"name": "symfony/service-contracts",
<<<<<<< HEAD
"version": "v3.6.1",
"version_normalized": "3.6.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
"reference": "45112560a3ba2d715666a509a0bc9521d10b6c43"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/45112560a3ba2d715666a509a0bc9521d10b6c43",
"reference": "45112560a3ba2d715666a509a0bc9521d10b6c43",
=======
"version": "v3.7.0",
"version_normalized": "3.7.0.0",
"source": {
@ -9554,7 +9285,6 @@
"type": "zip",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/d25d82433a80eba6aa0e6c24b61d7370d99e444a",
"reference": "d25d82433a80eba6aa0e6c24b61d7370d99e444a",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"shasum": ""
},
"require": {
@ -9565,11 +9295,7 @@
"conflict": {
"ext-psr": "<1.1|>=2"
},
<<<<<<< HEAD
"time": "2025-07-15T11:30:57+00:00",
=======
"time": "2026-03-28T09:44:51+00:00",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"type": "library",
"extra": {
"thanks": {
@ -9614,11 +9340,7 @@
"standards"
],
"support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/service-contracts/tree/v3.6.1"
=======
"source": "https://github.com/symfony/service-contracts/tree/v3.7.0"
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
},
"funding": [
{
@ -9736,19 +9458,6 @@
},
{
"name": "symfony/translation",
<<<<<<< HEAD
"version": "v6.4.34",
"version_normalized": "6.4.34.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "d07d117db41341511671b0a1a2be48f2772189ce"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/d07d117db41341511671b0a1a2be48f2772189ce",
"reference": "d07d117db41341511671b0a1a2be48f2772189ce",
=======
"version": "v6.4.38",
"version_normalized": "6.4.38.0",
"source": {
@ -9760,7 +9469,6 @@
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/afaa31b0c12d9a659eed1ea97f268a614cc1299c",
"reference": "afaa31b0c12d9a659eed1ea97f268a614cc1299c",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"shasum": ""
},
"require": {
@ -9797,11 +9505,7 @@
"symfony/service-contracts": "^2.5|^3",
"symfony/yaml": "^5.4|^6.0|^7.0"
},
<<<<<<< HEAD
"time": "2026-02-16T20:44:03+00:00",
=======
"time": "2026-05-06T08:55:54+00:00",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"type": "library",
"installation-source": "dist",
"autoload": {
@ -9832,11 +9536,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/translation/tree/v6.4.34"
=======
"source": "https://github.com/symfony/translation/tree/v6.4.38"
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
},
"funding": [
{
@ -9860,19 +9560,6 @@
},
{
"name": "symfony/translation-contracts",
<<<<<<< HEAD
"version": "v3.6.1",
"version_normalized": "3.6.1.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation-contracts.git",
"reference": "65a8bc82080447fae78373aa10f8d13b38338977"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation-contracts/zipball/65a8bc82080447fae78373aa10f8d13b38338977",
"reference": "65a8bc82080447fae78373aa10f8d13b38338977",
=======
"version": "v3.7.0",
"version_normalized": "3.7.0.0",
"source": {
@ -9884,17 +9571,12 @@
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation-contracts/zipball/0ab302977a952b42fd51475c4ebac81f8da0a95d",
"reference": "0ab302977a952b42fd51475c4ebac81f8da0a95d",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"shasum": ""
},
"require": {
"php": ">=8.1"
},
<<<<<<< HEAD
"time": "2025-07-15T13:41:35+00:00",
=======
"time": "2026-01-05T13:30:16+00:00",
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
"type": "library",
"extra": {
"thanks": {
@ -9939,11 +9621,7 @@
"standards"
],
"support": {
<<<<<<< HEAD
"source": "https://github.com/symfony/translation-contracts/tree/v3.6.1"
=======
"source": "https://github.com/symfony/translation-contracts/tree/v3.7.0"
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
},
"funding": [
{

View File

@ -3,11 +3,7 @@
'name' => 'laravel/laravel',
'pretty_version' => 'dev-main',
'version' => 'dev-main',
<<<<<<< HEAD
'reference' => 'a0f578368181dd543e1282a1376187efb5041303',
=======
'reference' => 'a6b007189b5902da881873196f649d4bdf55dd0d',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@ -476,11 +472,7 @@
'laravel/laravel' => array(
'pretty_version' => 'dev-main',
'version' => 'dev-main',
<<<<<<< HEAD
'reference' => 'a0f578368181dd543e1282a1376187efb5041303',
=======
'reference' => 'a6b007189b5902da881873196f649d4bdf55dd0d',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@ -1187,30 +1179,18 @@
'dev_requirement' => true,
),
'symfony/console' => array(
<<<<<<< HEAD
'pretty_version' => 'v6.4.36',
'version' => '6.4.36.0',
'reference' => '9f481cfb580db8bcecc9b2d4c63f3e13df022ad5',
=======
'pretty_version' => 'v6.4.37',
'version' => '6.4.37.0',
'reference' => '7bbcaf3fdb1e18fa42a7f0b84a10d091c10548f5',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/console',
'aliases' => array(),
'dev_requirement' => false,
),
'symfony/css-selector' => array(
<<<<<<< HEAD
'pretty_version' => 'v7.4.8',
'version' => '7.4.8.0',
'reference' => 'b055f228a4178a1d6774909903905e3475f3eac8',
=======
'pretty_version' => 'v7.4.9',
'version' => '7.4.9.0',
'reference' => 'b75663ed96cf4756e28e3105476f220f92886cc4',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/css-selector',
'aliases' => array(),
@ -1244,15 +1224,9 @@
'dev_requirement' => false,
),
'symfony/event-dispatcher' => array(
<<<<<<< HEAD
'pretty_version' => 'v7.4.8',
'version' => '7.4.8.0',
'reference' => 'f57b899fa736fd71121168ef268f23c206083f0a',
=======
'pretty_version' => 'v7.4.9',
'version' => '7.4.9.0',
'reference' => 'e4a2e29753c7801f7a8340e066cfa788f3bc8101',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/event-dispatcher',
'aliases' => array(),
@ -1301,15 +1275,9 @@
'dev_requirement' => false,
),
'symfony/http-kernel' => array(
<<<<<<< HEAD
'pretty_version' => 'v6.4.36',
'version' => '6.4.36.0',
'reference' => '4087ec02119de450e9ebb60806d69c6bb8c6e468',
=======
'pretty_version' => 'v6.4.38',
'version' => '6.4.38.0',
'reference' => '769c1ee766d6c327176f4e3bdaad58f521193abd',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/http-kernel',
'aliases' => array(),
@ -1325,58 +1293,35 @@
'dev_requirement' => false,
),
'symfony/mime' => array(
<<<<<<< HEAD
'pretty_version' => 'v6.4.36',
'version' => '6.4.36.0',
'reference' => '9c31726137c70798f815fb98293ffb8a2a47694c',
=======
'pretty_version' => 'v6.4.37',
'version' => '6.4.37.0',
'reference' => '330077bc7fbe314758aff62834b758d06ac6d260',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/mime',
'aliases' => array(),
'dev_requirement' => false,
),
'symfony/polyfill-ctype' => array(
<<<<<<< HEAD
'pretty_version' => 'v1.33.0',
'version' => '1.33.0.0',
'reference' => 'a3cc8b044a6ea513310cbd48ef7333b384945638',
=======
'pretty_version' => 'v1.37.0',
'version' => '1.37.0.0',
'reference' => '141046a8f9477948ff284fa65be2095baafb94f2',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-ctype',
'aliases' => array(),
'dev_requirement' => false,
),
'symfony/polyfill-intl-grapheme' => array(
<<<<<<< HEAD
'pretty_version' => 'v1.33.0',
'version' => '1.33.0.0',
'reference' => '380872130d3a5dd3ace2f4010d95125fde5d5c70',
=======
'pretty_version' => 'v1.37.0',
'version' => '1.37.0.0',
'reference' => '4864388bfbd3001ce88e234fab652acd91fdc57e',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-intl-grapheme',
'aliases' => array(),
'dev_requirement' => false,
),
'symfony/polyfill-intl-idn' => array(
<<<<<<< HEAD
'pretty_version' => 'v1.33.0',
'version' => '1.33.0.0',
=======
'pretty_version' => 'v1.37.0',
'version' => '1.37.0.0',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'reference' => '9614ac4d8061dc257ecc64cba1b140873dce8ad3',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-intl-idn',
@ -1384,13 +1329,8 @@
'dev_requirement' => false,
),
'symfony/polyfill-intl-normalizer' => array(
<<<<<<< HEAD
'pretty_version' => 'v1.33.0',
'version' => '1.33.0.0',
=======
'pretty_version' => 'v1.37.0',
'version' => '1.37.0.0',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'reference' => '3833d7255cc303546435cb650316bff708a1c75c',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer',
@ -1398,60 +1338,36 @@
'dev_requirement' => false,
),
'symfony/polyfill-mbstring' => array(
<<<<<<< HEAD
'pretty_version' => 'v1.33.0',
'version' => '1.33.0.0',
'reference' => '6d857f4d76bd4b343eac26d6b539585d2bc56493',
=======
'pretty_version' => 'v1.37.0',
'version' => '1.37.0.0',
'reference' => '6a21eb99c6973357967f6ce3708cd55a6bec6315',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
'aliases' => array(),
'dev_requirement' => false,
),
'symfony/polyfill-php80' => array(
<<<<<<< HEAD
'pretty_version' => 'v1.33.0',
'version' => '1.33.0.0',
'reference' => '0cc9dd0f17f61d8131e7df6b84bd344899fe2608',
=======
'pretty_version' => 'v1.37.0',
'version' => '1.37.0.0',
'reference' => 'dfb55726c3a76ea3b6459fcfda1ec2d80a682411',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-php80',
'aliases' => array(),
'dev_requirement' => false,
),
'symfony/polyfill-php83' => array(
<<<<<<< HEAD
'pretty_version' => 'v1.33.0',
'version' => '1.33.0.0',
'reference' => '17f6f9a6b1735c0f163024d959f700cfbc5155e5',
=======
'pretty_version' => 'v1.37.0',
'version' => '1.37.0.0',
'reference' => '3600c2cb22399e25bb226e4a135ce91eeb2a6149',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-php83',
'aliases' => array(),
'dev_requirement' => false,
),
'symfony/polyfill-uuid' => array(
<<<<<<< HEAD
'pretty_version' => 'v1.33.0',
'version' => '1.33.0.0',
'reference' => '21533be36c24be3f4b1669c4725c7d1d2bab4ae2',
=======
'pretty_version' => 'v1.37.0',
'version' => '1.37.0.0',
'reference' => '26dfec253c4cf3e51b541b52ddf7e42cb0908e94',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-uuid',
'aliases' => array(),
@ -1467,30 +1383,18 @@
'dev_requirement' => false,
),
'symfony/routing' => array(
<<<<<<< HEAD
'pretty_version' => 'v6.4.34',
'version' => '6.4.34.0',
'reference' => '5ab3a3e1a03535ec5ca6ce2d39e4369a1096ae47',
=======
'pretty_version' => 'v6.4.37',
'version' => '6.4.37.0',
'reference' => '48035d186798d27d375d95aad37db8fe097e4048',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/routing',
'aliases' => array(),
'dev_requirement' => false,
),
'symfony/service-contracts' => array(
<<<<<<< HEAD
'pretty_version' => 'v3.6.1',
'version' => '3.6.1.0',
'reference' => '45112560a3ba2d715666a509a0bc9521d10b6c43',
=======
'pretty_version' => 'v3.7.0',
'version' => '3.7.0.0',
'reference' => 'd25d82433a80eba6aa0e6c24b61d7370d99e444a',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/service-contracts',
'aliases' => array(),
@ -1506,30 +1410,18 @@
'dev_requirement' => false,
),
'symfony/translation' => array(
<<<<<<< HEAD
'pretty_version' => 'v6.4.34',
'version' => '6.4.34.0',
'reference' => 'd07d117db41341511671b0a1a2be48f2772189ce',
=======
'pretty_version' => 'v6.4.38',
'version' => '6.4.38.0',
'reference' => 'afaa31b0c12d9a659eed1ea97f268a614cc1299c',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/translation',
'aliases' => array(),
'dev_requirement' => false,
),
'symfony/translation-contracts' => array(
<<<<<<< HEAD
'pretty_version' => 'v3.6.1',
'version' => '3.6.1.0',
'reference' => '65a8bc82080447fae78373aa10f8d13b38338977',
=======
'pretty_version' => 'v3.7.0',
'version' => '3.7.0.0',
'reference' => '0ab302977a952b42fd51475c4ebac81f8da0a95d',
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/translation-contracts',
'aliases' => array(),