diff --git a/app/AdminModule/Forms/EditUserTransferFormFactory.php b/app/AdminModule/Forms/EditUserTransferFormFactory.php index 692fab676..bf1293c2b 100644 --- a/app/AdminModule/Forms/EditUserTransferFormFactory.php +++ b/app/AdminModule/Forms/EditUserTransferFormFactory.php @@ -51,7 +51,8 @@ public function create(int $id): Form ->setDisabled(! $this->user->isRegistered() || ! $this->user->hasPaidAnyApplication()) ->setHtmlAttribute('class', 'btn btn-danger') ->setHtmlAttribute('data-toggle', 'confirmation') - ->setHtmlAttribute('data-content', $this->translator->translate('admin.users.users_transfer_confirm')); + ->setHtmlAttribute('data-content', $this->translator->translate('admin.users.users_transfer_confirm')) + ->setHtmlAttribute('data-html', 'true'); $form->onSuccess[] = [$this, 'processForm']; diff --git a/app/Model/Enums/PaymentState.php b/app/Model/Enums/PaymentState.php index 5c2f04081..51f4aa2c5 100644 --- a/app/Model/Enums/PaymentState.php +++ b/app/Model/Enums/PaymentState.php @@ -16,6 +16,11 @@ class PaymentState */ public const PAIRED_MANUAL = 'paired_manual'; + /** + * Spárovaná přihláška byla zrušena. + */ + public const PAIRED_CANCELED = 'paired_canceled'; + /** * Nespárováno - nesouhlasí poplatek. */ @@ -45,6 +50,7 @@ class PaymentState public static array $states = [ self::PAIRED_AUTO, self::PAIRED_MANUAL, + self::PAIRED_CANCELED, self::NOT_PAIRED_FEE, self::NOT_PAIRED_VS, self::NOT_PAIRED_CANCELED, diff --git a/app/Model/Structure/Subevent.php b/app/Model/Structure/Subevent.php index 182a7740c..6764ecaac 100644 --- a/app/Model/Structure/Subevent.php +++ b/app/Model/Structure/Subevent.php @@ -429,11 +429,10 @@ public function countUsers(): int // // return $this->applications->matching($criteria)->count(); - return $this->applications->filter(static fn (Application $application) => $application->getValidTo() === null && ( - $application->getState() === ApplicationState::WAITING_FOR_PAYMENT || - $application->getState() === ApplicationState::PAID_FREE || - $application->getState() === ApplicationState::PAID || - $application->getState() === ApplicationState::PAID_TRANSFERED))->count(); + return $this->applications->filter( + static fn (Application $application) => $application->getValidTo() === null && ( + $application->getState() === ApplicationState::WAITING_FOR_PAYMENT || $application->isPaid()), + )->count(); } public function countUnoccupied(): int|null diff --git a/app/Model/User/User.php b/app/Model/User/User.php index 7bb21c8a6..f1ff535bb 100644 --- a/app/Model/User/User.php +++ b/app/Model/User/User.php @@ -811,11 +811,9 @@ public function getPaidApplications(): Collection */ public function getPaidAndTransferedAndFreeApplications(): Collection { - return $this->applications->filter(static fn (Application $application) => $application->getValidTo() === null && ( - $application->getState() === ApplicationState::PAID || - $application->getState() === ApplicationState::PAID_FREE || - $application->getState() === ApplicationState::PAID_TRANSFERED - )); + return $this->applications->filter( + static fn (Application $application) => $application->getValidTo() === null && $application->isPaid(), + ); } /** diff --git a/app/Services/ApplicationService.php b/app/Services/ApplicationService.php index 2aecb8e5c..b79b29026 100644 --- a/app/Services/ApplicationService.php +++ b/app/Services/ApplicationService.php @@ -282,10 +282,8 @@ public function cancelRegistration(User $user, string $state, User|null $created if ($newApplication->getPayment() !== null) { if ($newApplication->getPayment()->getPairedValidApplications()->count() === 1) { - $newApplication->getPayment()->setState(PaymentState::NOT_PAIRED_CANCELED); + $newApplication->getPayment()->setState(PaymentState::PAIRED_CANCELED); } - - $newApplication->setPayment(null); } $this->applicationRepository->save($newApplication); @@ -448,10 +446,8 @@ public function cancelSubeventsApplication(SubeventsApplication $application, st if ($newApplication->getPayment() !== null) { if ($newApplication->getPayment()->getPairedValidApplications()->count() === 1) { - $newApplication->getPayment()->setState(PaymentState::NOT_PAIRED_CANCELED); + $newApplication->getPayment()->setState(PaymentState::PAIRED_CANCELED); } - - $newApplication->setPayment(null); } $this->applicationRepository->save($newApplication); @@ -568,17 +564,9 @@ public function createPayment( $pairedApplication = $this->applicationRepository->findValidByVariableSymbol($variableSymbol); if ($pairedApplication) { - if ( - $pairedApplication->getState() === ApplicationState::PAID || - $pairedApplication->getState() === ApplicationState::PAID_FREE || - $pairedApplication->getState() === ApplicationState::PAID_TRANSFERED - ) { + if ($pairedApplication->isPaid()) { $payment->setState(PaymentState::NOT_PAIRED_PAID); - } elseif ( - $pairedApplication->getState() === ApplicationState::CANCELED || - $pairedApplication->getState() === ApplicationState::CANCELED_NOT_PAID || - $pairedApplication->getState() === ApplicationState::CANCELED_TRANSFERED - ) { + } elseif ($pairedApplication->isCanceled()) { $payment->setState(PaymentState::NOT_PAIRED_CANCELED); } elseif (abs($pairedApplication->getFee() - $amount) >= 0.01) { $payment->setState(PaymentState::NOT_PAIRED_FEE); @@ -812,39 +800,47 @@ public function transferRegistration(User $sourceUser, User $targetUser, User $c $targetUserPaidSubevents = $targetUser->getPaidSubevents(); // přidání zaplacených podakcí od zdrojového uživatele (kromě podakcí nekompatibilních s jeho stávajícími) - /** @var ArrayCollection $targetSubevents */ - $targetSubevents = new ArrayCollection(); + /** @var ArrayCollection $addSubevents */ + $addSubevents = new ArrayCollection(); foreach ($sourceUserPaidSubevents as $subevent) { - if (! $targetSubevents->contains($subevent)) { + if (! $addSubevents->contains($subevent)) { foreach ($subevent->getIncompatibleSubevents() as $incompatibleSubevent) { if ($targetUserPaidSubevents->contains($incompatibleSubevent)) { continue 2; } } - $targetSubevents->add($subevent); + $addSubevents->add($subevent); } } + $addSubeventsFiltered = clone$addSubevents; + // odebrání podakcí, které už cílový uživatel má, ale budou mu přidány převodem foreach ($targetUser->getNotCanceledSubeventsApplications() as $application) { - $remainingSubevents = new ArrayCollection(); + if ($application->isPaid()) { + foreach ($application->getSubevents() as $subevent) { + $addSubeventsFiltered->removeElement($subevent); + } + } else { + $remainingApplicationSubevents = new ArrayCollection(); - foreach ($application->getSubevents() as $subevent) { - if (! $targetSubevents->contains($subevent)) { - $remainingSubevents->add($subevent); + foreach ($application->getSubevents() as $subevent) { + if (! $addSubevents->contains($subevent)) { + $remainingApplicationSubevents->add($subevent); + } } - } - if ($remainingSubevents->isEmpty()) { - $this->cancelSubeventsApplication($application, ApplicationState::CANCELED, $createdBy); - } else { - $this->updateSubeventsApplication($application, $remainingSubevents, $createdBy); + if ($remainingApplicationSubevents->isEmpty()) { + $this->cancelSubeventsApplication($application, ApplicationState::CANCELED, $createdBy); + } else { + $this->updateSubeventsApplication($application, $remainingApplicationSubevents, $createdBy); + } } } $this->updateRoles($targetUser, $targetRoles, $createdBy, false, true); - $this->addSubeventsApplication($targetUser, $targetSubevents, $createdBy, true); + $this->addSubeventsApplication($targetUser, $addSubeventsFiltered, $createdBy, true); $this->cancelRegistration($sourceUser, ApplicationState::CANCELED_TRANSFERED, $createdBy); }); diff --git a/app/assets/common/main.js b/app/assets/common/main.js index 43dd6dfa2..781807508 100644 --- a/app/assets/common/main.js +++ b/app/assets/common/main.js @@ -115,7 +115,8 @@ function initSelects() { actionsBox: true, iconBase: 'fa', tickIcon: 'fa-check', - style: 'btn-light' + style: 'btn-light', + windowPadding: [50, 0, 0, 0] }); } diff --git a/app/lang/admin.cs_CZ.neon b/app/lang/admin.cs_CZ.neon index 59fee6829..fa983374e 100644 --- a/app/lang/admin.cs_CZ.neon +++ b/app/lang/admin.cs_CZ.neon @@ -479,7 +479,7 @@ users: users_edit_roles_occupied: "Všechna místa v některé roli jsou obsazena." users_edit_roles_nonregistered: "Roli \"Nepřihlášený\" není možné nastavit, použijte odhlášení ze semináře." users_transfer: "Převést registraci" - users_transfer_confirm: "Opravdu chcete registraci převést na nového uživatele?" + users_transfer_confirm: "Opravdu chcete registraci převést na nového uživatele?
Pokud cílový uživatel už má zaplacené některé z převáděných podakcí nebo nekompatibilní podakce, budou mu přidány jen ostatní a tyto budou uvolněny." users_applications_application_date: "Čas přihlášení" users_applications_roles: "Role" diff --git a/app/lang/common.cs_CZ.neon b/app/lang/common.cs_CZ.neon index 1ffee829d..a1ff12063 100644 --- a/app/lang/common.cs_CZ.neon +++ b/app/lang/common.cs_CZ.neon @@ -84,6 +84,7 @@ payment: payment_state: paired_auto: "Spárována (automaticky)" paired_manual: "Spárována (ručně)" + paired_canceled: "Spárována (přihláška zrušena)" not_paired_fee: "Nespárována (nesouhlasí částka)" not_paired_vs: "Nespárována (neexistuje variabilní symbol)" not_paired_canceled: "Nespárována (přihláška zrušena)" diff --git a/composer.lock b/composer.lock index adf1dc181..92ee12a41 100644 --- a/composer.lock +++ b/composer.lock @@ -5562,16 +5562,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "2.3.0", + "version": "2.3.2", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "c972c146ddd5e8350ea839355b9bb0ce6a8fa33e" + "reference": "08d4e08cf0c7e6182750cef7958b860b8c7f10ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/c972c146ddd5e8350ea839355b9bb0ce6a8fa33e", - "reference": "c972c146ddd5e8350ea839355b9bb0ce6a8fa33e", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/08d4e08cf0c7e6182750cef7958b860b8c7f10ad", + "reference": "08d4e08cf0c7e6182750cef7958b860b8c7f10ad", "shasum": "" }, "require": { @@ -5660,9 +5660,9 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/2.3.0" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/2.3.2" }, - "time": "2024-09-29T07:06:02+00:00" + "time": "2024-11-10T09:35:47+00:00" }, { "name": "phpstan/phpdoc-parser", @@ -6512,16 +6512,16 @@ }, { "name": "symfony/console", - "version": "v5.4.46", + "version": "v5.4.47", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "fb0d4760e7147d81ab4d9e2d57d56268261b4e4e" + "reference": "c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/fb0d4760e7147d81ab4d9e2d57d56268261b4e4e", - "reference": "fb0d4760e7147d81ab4d9e2d57d56268261b4e4e", + "url": "https://api.github.com/repos/symfony/console/zipball/c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed", + "reference": "c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed", "shasum": "" }, "require": { @@ -6591,7 +6591,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.46" + "source": "https://github.com/symfony/console/tree/v5.4.47" }, "funding": [ { @@ -6607,7 +6607,7 @@ "type": "tidelift" } ], - "time": "2024-11-05T14:17:06+00:00" + "time": "2024-11-06T11:30:55+00:00" }, { "name": "symfony/deprecation-contracts", @@ -7749,16 +7749,16 @@ }, { "name": "symfony/property-info", - "version": "v7.1.6", + "version": "v7.1.8", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "6b630ff585d9fdc72f50369885ad4364a849cf02" + "reference": "3748f85f64351d282fd028e44309856f1d79142e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/6b630ff585d9fdc72f50369885ad4364a849cf02", - "reference": "6b630ff585d9fdc72f50369885ad4364a849cf02", + "url": "https://api.github.com/repos/symfony/property-info/zipball/3748f85f64351d282fd028e44309856f1d79142e", + "reference": "3748f85f64351d282fd028e44309856f1d79142e", "shasum": "" }, "require": { @@ -7774,7 +7774,7 @@ }, "require-dev": { "phpdocumentor/reflection-docblock": "^5.2", - "phpstan/phpdoc-parser": "^1.0", + "phpstan/phpdoc-parser": "^1.0|^2.0", "symfony/cache": "^6.4|^7.0", "symfony/dependency-injection": "^6.4|^7.0", "symfony/serializer": "^6.4|^7.0" @@ -7813,7 +7813,7 @@ "validator" ], "support": { - "source": "https://github.com/symfony/property-info/tree/v7.1.6" + "source": "https://github.com/symfony/property-info/tree/v7.1.8" }, "funding": [ { @@ -7829,7 +7829,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-11-09T07:07:11+00:00" }, { "name": "symfony/redis-messenger", @@ -8045,16 +8045,16 @@ }, { "name": "symfony/string", - "version": "v6.4.13", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627" + "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", - "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", + "url": "https://api.github.com/repos/symfony/string/zipball/73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", + "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", "shasum": "" }, "require": { @@ -8111,7 +8111,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.13" + "source": "https://github.com/symfony/string/tree/v6.4.15" }, "funding": [ { @@ -8127,7 +8127,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:18:03+00:00" + "time": "2024-11-13T13:31:12+00:00" }, { "name": "symfony/translation", @@ -8304,16 +8304,16 @@ }, { "name": "symfony/type-info", - "version": "v7.1.6", + "version": "v7.1.8", "source": { "type": "git", "url": "https://github.com/symfony/type-info.git", - "reference": "a13032128c307470955c45c99201349b15cd7f4a" + "reference": "51535dde21c7abf65c9d000a30bb15f6478195e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/type-info/zipball/a13032128c307470955c45c99201349b15cd7f4a", - "reference": "a13032128c307470955c45c99201349b15cd7f4a", + "url": "https://api.github.com/repos/symfony/type-info/zipball/51535dde21c7abf65c9d000a30bb15f6478195e6", + "reference": "51535dde21c7abf65c9d000a30bb15f6478195e6", "shasum": "" }, "require": { @@ -8326,7 +8326,7 @@ "symfony/property-info": "<6.4" }, "require-dev": { - "phpstan/phpdoc-parser": "^1.0", + "phpstan/phpdoc-parser": "^1.0|^2.0", "symfony/dependency-injection": "^6.4|^7.0", "symfony/property-info": "^6.4|^7.0" }, @@ -8366,7 +8366,7 @@ "type" ], "support": { - "source": "https://github.com/symfony/type-info/tree/v7.1.6" + "source": "https://github.com/symfony/type-info/tree/v7.1.8" }, "funding": [ { @@ -8382,7 +8382,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-11-07T15:49:33+00:00" }, { "name": "symfony/yaml", @@ -9927,16 +9927,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.8", + "version": "1.12.10", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c" + "reference": "fc463b5d0fe906dcf19689be692c65c50406a071" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6a60a4d66142b8156c9da923f1972657bc4748c", - "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/fc463b5d0fe906dcf19689be692c65c50406a071", + "reference": "fc463b5d0fe906dcf19689be692c65c50406a071", "shasum": "" }, "require": { @@ -9981,7 +9981,7 @@ "type": "github" } ], - "time": "2024-11-06T19:06:49+00:00" + "time": "2024-11-11T15:37:09+00:00" }, { "name": "phpstan/phpstan-doctrine", @@ -10603,12 +10603,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "e63317470a1b96346be224a68f9e64567e1001c3" + "reference": "1b71197bf4ffb07c6beb67162144e07052aac77c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/e63317470a1b96346be224a68f9e64567e1001c3", - "reference": "e63317470a1b96346be224a68f9e64567e1001c3", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/1b71197bf4ffb07c6beb67162144e07052aac77c", + "reference": "1b71197bf4ffb07c6beb67162144e07052aac77c", "shasum": "" }, "conflict": { @@ -10717,7 +10717,7 @@ "contao/managed-edition": "<=1.5", "corveda/phpsandbox": "<1.3.5", "cosenary/instagram": "<=2.3", - "craftcms/cms": "<4.6.2|>=5,<=5.2.2", + "craftcms/cms": "<=4.12.6.1|>=5,<=5.4.7.1", "croogo/croogo": "<4", "cuyz/valinor": "<0.12", "czim/file-handling": "<1.5|>=2,<2.3", @@ -10927,7 +10927,7 @@ "lara-zeus/artemis": ">=1,<=1.0.6", "lara-zeus/dynamic-dashboard": ">=3,<=3.0.1", "laravel/fortify": "<1.11.1", - "laravel/framework": "<6.20.44|>=7,<7.30.6|>=8,<8.75", + "laravel/framework": "<6.20.45|>=7,<7.30.7|>=8,<8.83.28|>=9,<9.52.17|>=10,<10.48.23|>=11,<11.31", "laravel/laravel": ">=5.4,<5.4.22", "laravel/reverb": "<1.4", "laravel/socialite": ">=1,<2.0.10", @@ -10985,7 +10985,7 @@ "mojo42/jirafeau": "<4.4", "mongodb/mongodb": ">=1,<1.9.2", "monolog/monolog": ">=1.8,<1.12", - "moodle/moodle": "<4.3.6|>=4.4.0.0-beta,<4.4.2", + "moodle/moodle": "<4.3.6|>=4.4,<4.4.2", "mos/cimage": "<0.7.19", "movim/moxl": ">=0.8,<=0.10", "movingbytes/social-network": "<=1.2.1", @@ -11033,7 +11033,7 @@ "openmage/magento-lts": "<20.10.1", "opensolutions/vimbadmin": "<=3.0.15", "opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2", - "orchid/platform": ">=9,<9.4.4|>=14.0.0.0-alpha4,<14.5", + "orchid/platform": ">=8,<14.43", "oro/calendar-bundle": ">=4.2,<=4.2.6|>=5,<=5.0.6|>=5.1,<5.1.1", "oro/commerce": ">=4.1,<5.0.11|>=5.1,<5.1.1", "oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7", @@ -11223,7 +11223,7 @@ "symfony/error-handler": ">=4.4,<4.4.4|>=5,<5.0.4", "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7|>=5.3.14,<5.3.15|>=5.4.3,<5.4.4|>=6.0.3,<6.0.4", - "symfony/http-client": ">=4.3,<5.4.46|>=6,<6.4.14|>=7,<7.1.7", + "symfony/http-client": ">=4.3,<5.4.47|>=6,<6.4.15|>=7,<7.1.8", "symfony/http-foundation": "<5.4.46|>=6,<6.4.14|>=7,<7.1.7", "symfony/http-kernel": ">=2,<4.4.50|>=5,<5.4.20|>=6,<6.0.20|>=6.1,<6.1.12|>=6.2,<6.2.6", "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", @@ -11241,9 +11241,9 @@ "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.9", "symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", "symfony/security-guard": ">=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8", - "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7|>=5.1,<5.2.8|>=5.3,<5.3.2|>=5.4,<5.4.31|>=6,<6.3.8", + "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7|>=5.1,<5.2.8|>=5.3,<5.4.47|>=6,<6.4.15|>=7,<7.1.8", "symfony/serializer": ">=2,<2.0.11|>=4.1,<4.4.35|>=5,<5.3.12", - "symfony/symfony": "<5.4.46|>=6,<6.4.14|>=7,<7.1.7", + "symfony/symfony": "<5.4.47|>=6,<6.4.15|>=7,<7.1.8", "symfony/translation": ">=2,<2.0.17", "symfony/twig-bridge": ">=2,<4.4.51|>=5,<5.4.31|>=6,<6.3.8", "symfony/ux-autocomplete": "<2.11.2", @@ -11435,7 +11435,7 @@ "type": "tidelift" } ], - "time": "2024-11-07T19:04:57+00:00" + "time": "2024-11-13T16:05:45+00:00" }, { "name": "sebastian/cli-parser", @@ -12467,16 +12467,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.10.3", + "version": "3.11.0", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "62d32998e820bddc40f99f8251958aed187a5c9c" + "reference": "70c08f8d20c0eb4fe56f26644dd94dae76a7f450" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c", - "reference": "62d32998e820bddc40f99f8251958aed187a5c9c", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/70c08f8d20c0eb4fe56f26644dd94dae76a7f450", + "reference": "70c08f8d20c0eb4fe56f26644dd94dae76a7f450", "shasum": "" }, "require": { @@ -12543,7 +12543,7 @@ "type": "open_collective" } ], - "time": "2024-09-18T10:38:58+00:00" + "time": "2024-11-12T09:53:29+00:00" }, { "name": "symfony/browser-kit", @@ -12863,10 +12863,10 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "vojtys/nette-forms-gpspicker": 20, - "skautis/skautis": 15, + "roave/security-advisories": 20, "skautis/nette": 15, - "roave/security-advisories": 20 + "skautis/skautis": 15, + "vojtys/nette-forms-gpspicker": 20 }, "prefer-stable": false, "prefer-lowest": false, @@ -12880,6 +12880,6 @@ "ext-mysqli": "*", "ext-soap": "*" }, - "platform-dev": [], + "platform-dev": {}, "plugin-api-version": "2.6.0" }