From 76ca2b6930380699f3389e0f67b453817890e77c Mon Sep 17 00:00:00 2001 From: Mykhailo Los Date: Fri, 6 Dec 2024 20:10:15 +0200 Subject: [PATCH] [MOOSE-168]: Resolve conflicts --- composer.lock | 104 +++++++++++++++++++++----------------------------- 1 file changed, 43 insertions(+), 61 deletions(-) diff --git a/composer.lock b/composer.lock index b99512e1..1276d67d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7762570ae1f8a195de45fb8b1f8d724c", + "content-hash": "f360e1ce4b6d57f35b63550a0cdedb5e", "packages": [ { "name": "aws/aws-crt-php", @@ -62,16 +62,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.332.0", + "version": "3.334.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "3b4972a465b66fe3da461a3febdcc363954a0969" + "reference": "3938b3467f64a30fed7ee1762a6785f808a5ae4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3b4972a465b66fe3da461a3febdcc363954a0969", - "reference": "3b4972a465b66fe3da461a3febdcc363954a0969", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3938b3467f64a30fed7ee1762a6785f808a5ae4d", + "reference": "3938b3467f64a30fed7ee1762a6785f808a5ae4d", "shasum": "" }, "require": { @@ -154,9 +154,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.332.0" + "source": "https://github.com/aws/aws-sdk-php/tree/3.334.1" }, - "time": "2024-12-02T03:48:16+00:00" + "time": "2024-12-05T01:17:41+00:00" }, { "name": "block-editor-custom-alignments/block-editor-custom-alignments", @@ -6585,6 +6585,24 @@ }, "time": "2024-10-16T12:50:47+00:00" }, + { + "name": "wpackagist-plugin/debug-bar", + "version": "1.1.6", + "source": { + "type": "svn", + "url": "https://plugins.svn.wordpress.org/debug-bar/", + "reference": "tags/1.1.6" + }, + "dist": { + "type": "zip", + "url": "https://downloads.wordpress.org/plugin/debug-bar.1.1.6.zip" + }, + "require": { + "composer/installers": "^1.0 || ^2.0" + }, + "type": "wordpress-plugin", + "homepage": "https://wordpress.org/plugins/debug-bar/" + }, { "name": "wpackagist-plugin/disable-emojis", "version": "1.7.6", @@ -6711,24 +6729,6 @@ "type": "wordpress-plugin", "homepage": "https://wordpress.org/plugins/user-switching/" }, - { - "name": "wpackagist-plugin/wp-tota11y", - "version": "1.2.0", - "source": { - "type": "svn", - "url": "https://plugins.svn.wordpress.org/wp-tota11y/", - "reference": "tags/1.2.0" - }, - "dist": { - "type": "zip", - "url": "https://downloads.wordpress.org/plugin/wp-tota11y.1.2.0.zip" - }, - "require": { - "composer/installers": "^1.0 || ^2.0" - }, - "type": "wordpress-plugin", - "homepage": "https://wordpress.org/plugins/wp-tota11y/" - }, { "name": "wpengine/advanced-custom-fields-pro", "version": "6.3.11", @@ -6851,25 +6851,25 @@ }, { "name": "behat/gherkin", - "version": "v4.10.0", + "version": "v4.11.0", "source": { "type": "git", "url": "https://github.com/Behat/Gherkin.git", - "reference": "cbb83c4c435dd8d05a161f2a5ae322e61b2f4db6" + "reference": "32821a17b12620951e755b5d49328a6421a5b5b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Gherkin/zipball/cbb83c4c435dd8d05a161f2a5ae322e61b2f4db6", - "reference": "cbb83c4c435dd8d05a161f2a5ae322e61b2f4db6", + "url": "https://api.github.com/repos/Behat/Gherkin/zipball/32821a17b12620951e755b5d49328a6421a5b5b5", + "reference": "32821a17b12620951e755b5d49328a6421a5b5b5", "shasum": "" }, "require": { - "php": "~7.2|~8.0" + "php": "8.1.* || 8.2.* || 8.3.* || 8.4.*" }, "require-dev": { "cucumber/cucumber": "dev-gherkin-24.1.0", - "phpunit/phpunit": "~8|~9", - "symfony/yaml": "~3|~4|~5|~6|~7" + "phpunit/phpunit": "^9.6", + "symfony/yaml": "^5.4 || ^6.4 || ^7.0" }, "suggest": { "symfony/yaml": "If you want to parse features, represented in YAML files" @@ -6908,9 +6908,9 @@ ], "support": { "issues": "https://github.com/Behat/Gherkin/issues", - "source": "https://github.com/Behat/Gherkin/tree/v4.10.0" + "source": "https://github.com/Behat/Gherkin/tree/v4.11.0" }, - "time": "2024-10-19T14:46:06+00:00" + "time": "2024-12-06T10:07:25+00:00" }, { "name": "bordoni/phpass", @@ -9911,16 +9911,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.21", + "version": "9.6.22", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa" + "reference": "f80235cb4d3caa59ae09be3adf1ded27521d1a9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", - "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f80235cb4d3caa59ae09be3adf1ded27521d1a9c", + "reference": "f80235cb4d3caa59ae09be3adf1ded27521d1a9c", "shasum": "" }, "require": { @@ -9931,7 +9931,7 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.12.0", + "myclabs/deep-copy": "^1.12.1", "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=7.3", @@ -9994,7 +9994,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.21" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.22" }, "funding": [ { @@ -10010,7 +10010,7 @@ "type": "tidelift" } ], - "time": "2024-09-19T10:50:18+00:00" + "time": "2024-12-05T13:48:26+00:00" }, { "name": "psr/clock", @@ -12405,24 +12405,6 @@ ], "time": "2024-03-25T16:39:00+00:00" }, - { - "name": "wpackagist-plugin/debug-bar", - "version": "1.1.6", - "source": { - "type": "svn", - "url": "https://plugins.svn.wordpress.org/debug-bar/", - "reference": "tags/1.1.6" - }, - "dist": { - "type": "zip", - "url": "https://downloads.wordpress.org/plugin/debug-bar.1.1.6.zip" - }, - "require": { - "composer/installers": "^1.0 || ^2.0" - }, - "type": "wordpress-plugin", - "homepage": "https://wordpress.org/plugins/debug-bar/" - }, { "name": "zordius/lightncandy", "version": "v1.2.6", @@ -12488,7 +12470,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^8.2", + "php": "^8.3", "ext-exif": "*", "ext-gd": "*", "ext-intl": "*", @@ -12496,7 +12478,7 @@ }, "platform-dev": {}, "platform-overrides": { - "php": "8.2" + "php": "8.3" }, "plugin-api-version": "2.6.0" }